cscvs to tla changeset 29

[onak.git] / armor.c

diff --git a/armor.c b/armor.c
index e41cbadc7326ec4647ab812920f02456a01278a8..9f5c19a32eeadac1d40fc84bced2d55c49ca7c12 100644 (file)
--- a/armor.c
+++ b/armor.c
@@ -11,6 +11,7 @@
 
 #include "armor.h"
 #include "keystructs.h"
+#include "onak-conf.h"
 #include "parsekey.h"
 
 #define ARMOR_WIDTH 64
@@ -62,21 +63,6 @@ static unsigned char decode64(unsigned char c) {
        return c;
 }
 
-
-void putstring(int (*putchar_func)(void *ctx, unsigned char c),
-                       void *ctx,
-                       const char *string)
-{
-       int i;
-
-       assert(putchar_func != NULL);
-       assert(string != NULL);
-
-       for (i = 0; string[i] != 0; i++) {
-               putchar_func(ctx, string[i]);
-       }
-}
-
 /**
  *     @lastoctet: The last octet we got.
  *     @curoctet: The current octet we're expecting (0, 1 or 2).
@@ -90,7 +76,7 @@ struct armor_context {
        int curoctet;
        int count;
        long crc24;
-       int (*putchar_func)(void *ctx, unsigned char c);
+       int (*putchar_func)(void *ctx, size_t count, unsigned char *c);
        void *ctx;
 };
 
@@ -104,36 +90,44 @@ static void armor_init(struct armor_context *ctx)
 
 static void armor_finish(struct armor_context *state)
 {
+       unsigned char c;
+
        switch (state->curoctet++) {
        case 0:
                break;
        case 1:
-               state->putchar_func(state->ctx,
-                       encode64((state->lastoctet & 3) << 4));
-               state->putchar_func(state->ctx, '=');
-               state->putchar_func(state->ctx, '=');
+               c = encode64((state->lastoctet & 3) << 4);
+               state->putchar_func(state->ctx, 1, &c);
+               state->putchar_func(state->ctx, 1, (unsigned char *) "=");
+               state->putchar_func(state->ctx, 1, (unsigned char *) "=");
                break;
        case 2:
-               state->putchar_func(state->ctx,
-                       encode64((state->lastoctet & 0xF) << 2));
-               state->putchar_func(state->ctx, '=');
+               c = encode64((state->lastoctet & 0xF) << 2);
+               state->putchar_func(state->ctx, 1, &c);
+               state->putchar_func(state->ctx, 1, (unsigned char *) "=");
                break;
        }
 
        state->crc24 &= 0xffffffL;
-       state->putchar_func(state->ctx, '\n');
-       state->putchar_func(state->ctx, '=');
-       state->putchar_func(state->ctx, encode64(state->crc24 >> 18));
-       state->putchar_func(state->ctx, encode64((state->crc24 >> 12) & 0x3F));
-       state->putchar_func(state->ctx, encode64((state->crc24 >> 6) & 0x3F));
-       state->putchar_func(state->ctx, encode64(state->crc24 & 0x3F));
-       state->putchar_func(state->ctx, '\n');
+       state->putchar_func(state->ctx, 1, (unsigned char *) "\n");
+       state->putchar_func(state->ctx, 1, (unsigned char *) "=");
+       c = encode64(state->crc24 >> 18);
+       state->putchar_func(state->ctx, 1, &c);
+       c = encode64((state->crc24 >> 12) & 0x3F);
+       state->putchar_func(state->ctx, 1, &c);
+       c = encode64((state->crc24 >> 6) & 0x3F);
+       state->putchar_func(state->ctx, 1, &c);
+       c = encode64(state->crc24 & 0x3F);
+       state->putchar_func(state->ctx, 1, &c);
+       state->putchar_func(state->ctx, 1, (unsigned char *) "\n");
 
 }
 
-static int armor_putchar(void *ctx, unsigned char c)
+
+static int armor_putchar_int(void *ctx, unsigned char c)
 {
        struct armor_context *state;
+       unsigned char t;
        int i;
 
        assert(ctx != NULL);
@@ -141,18 +135,20 @@ static int armor_putchar(void *ctx, unsigned char c)
 
        switch (state->curoctet++) {
        case 0:
-               state->putchar_func(state->ctx, encode64(c >> 2));
+               t = encode64(c >> 2);
+               state->putchar_func(state->ctx, 1, &t);
                state->count++;
                break;
        case 1:
-               state->putchar_func(state->ctx,
-                       encode64(((state->lastoctet & 3) << 4) + (c >> 4)));
+               t = encode64(((state->lastoctet & 3) << 4) + (c >> 4));
+               state->putchar_func(state->ctx, 1, &t);
                state->count++;
                break;
        case 2:
-               state->putchar_func(state->ctx,
-                       encode64(((state->lastoctet & 0xF) << 2) + (c >> 6)));
-               state->putchar_func(state->ctx, encode64(c & 0x3F));
+               t = encode64(((state->lastoctet & 0xF) << 2) + (c >> 6));
+               state->putchar_func(state->ctx, 1, &t);
+               t = encode64(c & 0x3F);
+               state->putchar_func(state->ctx, 1, &t);
                state->count += 2;
                break;
        }
@@ -168,12 +164,24 @@ static int armor_putchar(void *ctx, unsigned char c)
        }
 
        if ((state->count % ARMOR_WIDTH) == 0) {
-               state->putchar_func(state->ctx, '\n');
+               state->putchar_func(state->ctx, 1, (unsigned char *) "\n");
        }
 
        return 0;
 }
 
+
+static int armor_putchar(void *ctx, size_t count, unsigned char *c)
+{
+       int i;
+
+       for (i = 0; i < count; i++) {
+               armor_putchar_int(ctx, c[i]);
+       }
+       
+       return 0;
+}
+
 /**
  *     @lastoctet: The last octet we got.
  *     @curoctet: The current octet we're expecting (0, 1 or 2).
@@ -187,7 +195,7 @@ struct dearmor_context {
        int curoctet;
        int count;
        long crc24;
-       int (*getchar_func)(void *ctx, unsigned char *c);
+       int (*getchar_func)(void *ctx, size_t count, unsigned char *c);
        void *ctx;
 };
 
@@ -226,7 +234,7 @@ static int dearmor_getchar(void *ctx, unsigned char *c)
        
        tmpc = 65;
        while (tmpc == 65) {
-               state->getchar_func(state->ctx, &tmpc);
+               state->getchar_func(state->ctx, 1, &tmpc);
                tmpc = decode64(tmpc);
        }
 
@@ -236,7 +244,7 @@ static int dearmor_getchar(void *ctx, unsigned char *c)
                        state->lastoctet = tmpc;
                        tmpc = 65;
                        while (tmpc == 65) {
-                               state->getchar_func(state->ctx, &tmpc);
+                               state->getchar_func(state->ctx, 1, &tmpc);
                                tmpc = decode64(tmpc);
                        }
                        *c = (state->lastoctet << 2) + (tmpc >> 4);
@@ -285,18 +293,20 @@ static int dearmor_getchar_c(void *ctx, size_t count, unsigned char *c)
  *     This function ASCII armors a list of OpenPGP packets and outputs it
  *     using putchar_func.
  */
-int armor_openpgp_stream(int (*putchar_func)(void *ctx, unsigned char c),
+int armor_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
+                                               unsigned char *c),
                                void *ctx,
                                struct openpgp_packet_list *packets)
 {
        struct armor_context armor_ctx;
 
-
        /*
         * Print armor header
         */
-       putstring(putchar_func, ctx, "-----BEGIN PGP PUBLIC KEY BLOCK-----\n");
-       putstring(putchar_func, ctx, "Version: onak 0.0.1\n\n");
+       putchar_func(ctx, sizeof("-----BEGIN PGP PUBLIC KEY BLOCK-----\n"),
+               (unsigned char *) "-----BEGIN PGP PUBLIC KEY BLOCK-----\n");
+       putchar_func(ctx, sizeof("Version: onak " VERSION "\n\n"),
+               (unsigned char *) "Version: onak " VERSION "\n\n");
        
        armor_init(&armor_ctx);
        armor_ctx.putchar_func = putchar_func;
@@ -307,7 +317,8 @@ int armor_openpgp_stream(int (*putchar_func)(void *ctx, unsigned char c),
        /*
         * Print armor footer
         */
-       putstring(putchar_func, ctx, "-----END PGP PUBLIC KEY BLOCK-----\n");
+       putchar_func(ctx, sizeof("-----END PGP PUBLIC KEY BLOCK-----\n"),
+               (unsigned char *) "-----END PGP PUBLIC KEY BLOCK-----\n");
 
        return 0;
 }
@@ -322,7 +333,8 @@ int armor_openpgp_stream(int (*putchar_func)(void *ctx, unsigned char c),
  *     armored OpenPGP stream and outputs the data as a linked list of
  *     packets.
  */
-int dearmor_openpgp_stream(int (*getchar_func)(void *ctx, unsigned char *c),
+int dearmor_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
+                                               unsigned char *c),
                                void *ctx,
                                struct openpgp_packet_list **packets)
 {
@@ -336,7 +348,7 @@ int dearmor_openpgp_stream(int (*getchar_func)(void *ctx, unsigned char *c),
         * with :s in them, then a blank line, then the data.
         */
        state = 1;
-       while (state != 4 && !getchar_func(ctx, &curchar)) {
+       while (state != 4 && !getchar_func(ctx, 1, &curchar)) {
                switch (state) {
                        case 0:
                                if (curchar == '\n') {
@@ -350,7 +362,7 @@ int dearmor_openpgp_stream(int (*getchar_func)(void *ctx, unsigned char *c),
                                        if (count == 5) {
                                                state = 2;
                                        }
-                               } else {
+                               } else if (curchar != '\n') {
                                        state = 0;
                                }
                                break;
@@ -368,19 +380,21 @@ int dearmor_openpgp_stream(int (*getchar_func)(void *ctx, unsigned char *c),
                                        if (count == 2) {
                                                state = 4;
                                        }
-                               } else {
+                               } else if (curchar != '\r') {
                                        count = 0;
                                }
                                break;
                }
        }
 
-       dearmor_init(&dearmor_ctx);
-       dearmor_ctx.getchar_func = getchar_func;
-       dearmor_ctx.ctx = ctx;
-       read_openpgp_stream(dearmor_getchar_c, &dearmor_ctx, packets);
-       dearmor_finish(&dearmor_ctx);
-       // TODO: Look for armor footer
+       if (state == 4) {
+               dearmor_init(&dearmor_ctx);
+               dearmor_ctx.getchar_func = getchar_func;
+               dearmor_ctx.ctx = ctx;
+               read_openpgp_stream(dearmor_getchar_c, &dearmor_ctx, packets);
+               dearmor_finish(&dearmor_ctx);
+               // TODO: Look for armor footer
+       }
 
        return 0;
 }