"Recognize" some extra subpacket types

[onak.git] / armor.c

diff --git a/armor.c b/armor.c
index d811e50b2fa40c9bbe29c9c2c1a52ee09ed74802..bb0085e348d3b73846367b7bab80938e0cc75f21 100644 (file)
--- a/armor.c
+++ b/armor.c
@@ -6,11 +6,13 @@
  * Copyright 2002 Project Purple
  */
 
-#include <assert.h>
 #include <stdlib.h>
 
 #include "armor.h"
+#include "config.h"
 #include "keystructs.h"
+#include "log.h"
+#include "onak-conf.h"
 #include "parsekey.h"
 
 #define ARMOR_WIDTH 64
@@ -33,7 +35,7 @@ static unsigned char encode64(unsigned char c) {
        } else if (c == 63) {
                c = '/';
        } else {
-               assert(c < 64);
+               log_assert(c < 64);
        }
 
        return c;
@@ -62,21 +64,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 +77,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,55 +91,77 @@ 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 *) "=");
+               state->count += 3;
+               if ((state->count % ARMOR_WIDTH) == 0) {
+                       state->putchar_func(state->ctx, 1,
+                                (unsigned char *) "\n");
+               }
                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 *) "=");
+               state->count += 2;
+               if ((state->count % ARMOR_WIDTH) == 0) {
+                       state->putchar_func(state->ctx, 1,
+                                (unsigned char *) "\n");
+               }
                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');
+       if ((state->count % ARMOR_WIDTH) != 0) {
+               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);
+       log_assert(ctx != NULL);
        state = (struct armor_context *) ctx;
 
        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 +177,26 @@ 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;
+
+       log_assert(c != NULL);
+
+       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).
@@ -201,16 +224,19 @@ static void dearmor_init(struct dearmor_context *ctx)
 
 static void dearmor_finish(struct dearmor_context *state)
 {
-       // Check the checksum,
+       /*
+        * Check the checksum
+        */
 
        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, '=');
+       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));
+       */
 }
 
 
@@ -220,7 +246,7 @@ static int dearmor_getchar(void *ctx, unsigned char *c)
        unsigned char tmpc;
        int i;
 
-       assert(ctx != NULL);
+       log_assert(ctx != NULL);
        state = (struct dearmor_context *) ctx;
        *c = 0;
        
@@ -285,18 +311,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") - 1,
+               (unsigned char *) "-----BEGIN PGP PUBLIC KEY BLOCK-----\n");
+       putchar_func(ctx, sizeof("Version: onak " PACKAGE_VERSION "\n\n") - 1,
+               (unsigned char *) "Version: onak " PACKAGE_VERSION "\n\n");
        
        armor_init(&armor_ctx);
        armor_ctx.putchar_func = putchar_func;
@@ -307,7 +335,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") - 1,
+               (unsigned char *) "-----END PGP PUBLIC KEY BLOCK-----\n");
 
        return 0;
 }
@@ -380,9 +409,12 @@ int dearmor_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                dearmor_init(&dearmor_ctx);
                dearmor_ctx.getchar_func = getchar_func;
                dearmor_ctx.ctx = ctx;
-               read_openpgp_stream(dearmor_getchar_c, &dearmor_ctx, packets);
+               read_openpgp_stream(dearmor_getchar_c, &dearmor_ctx,
+                       packets, 0);
                dearmor_finish(&dearmor_ctx);
-               // TODO: Look for armor footer
+               /*
+                * TODO: Look for armor footer
+                */
        }
 
        return 0;