cscvs to tla changeset 45

[onak.git] / parsekey.c

diff --git a/parsekey.c b/parsekey.c
index f83e8051015cb38cbbf0c1197854c0724b5397cc..a2ff57847e4cea077bfb8d8672a595d70cafa12a 100644 (file)
--- a/parsekey.c
+++ b/parsekey.c
@@ -39,11 +39,16 @@ int add_key(struct openpgp_publickey *key) {
  *
  *     This function takes an list of OpenPGP packets and attempts to parse it
  *     into a list of public keys with signatures and subkeys.
+ *
+ *      Returns a count of how many keys we parsed.
  */
 int parse_keys(struct openpgp_packet_list *packets,
                struct openpgp_publickey **keys)
 {
        struct openpgp_publickey *curkey = NULL;
+       int count;
+
+       count = 0;
 
        /*
         * If keys already has some keys in it then set curkey to the last one
@@ -89,6 +94,7 @@ int parse_keys(struct openpgp_packet_list *packets,
                        }
                        memset(curkey, 0, sizeof(*curkey));
                        curkey->publickey = packet_dup(packets->packet);
+                       count++;
                        break;
                case 13:
                case 17:
@@ -126,7 +132,7 @@ int parse_keys(struct openpgp_packet_list *packets,
                packets = packets->next;
        }
 
-       return 0;
+       return count;
 }
 
 /**
@@ -281,64 +287,66 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
  *     This function uses putchar_func to write characters to an OpenPGP
  *     packet stream from a linked list of packets.
  */
-int write_openpgp_stream(int (*putchar_func)(void *ctx, unsigned char c),
+int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count,
+                                               unsigned char *c),
                                void *ctx,
                                struct openpgp_packet_list *packets)
 {
        unsigned char   curchar = 0;
-       int             i;
 
        while (packets != NULL) {
                curchar = 0x80;
                if (packets->packet->newformat) {
                        curchar |= 0x40;
                        curchar |= packets->packet->tag;
-                       putchar_func(ctx, curchar);
+                       putchar_func(ctx, 1, &curchar);
 
                        if (packets->packet->length < 192) {
-                               putchar_func(ctx, packets->packet->length);
+                               curchar = packets->packet->length;
+                               putchar_func(ctx, 1, &curchar);
                        } else if (packets->packet->length > 191 &&
                                packets->packet->length < 8383) {
-//                             fputs("Potentially dodgy code here.\n", stderr);
-                               putchar_func(ctx, 
-                                       (((packets->packet->length - 192) &
-                                        0xFF00) >> 8) + 192);
-
-                               putchar_func(ctx, 
-                                       (packets->packet->length - 192) &
-                                        0xFF);
+                               curchar = (((packets->packet->length - 192) &
+                                        0xFF00) >> 8) + 192;
+                               putchar_func(ctx, 1, &curchar);
 
+                               curchar = (packets->packet->length - 192) &
+                                        0xFF;
+                               putchar_func(ctx, 1, &curchar);
                        } else {
                                fputs("Unsupported new format length.\n", stderr);
                        }
                } else {
                        curchar |= (packets->packet->tag << 2);
                        if (packets->packet->length < 256) {
-                               putchar_func(ctx, curchar);
-                               putchar_func(ctx, packets->packet->length);
+                               putchar_func(ctx, 1, &curchar);
+                               curchar = packets->packet->length;
+                               putchar_func(ctx, 1, &curchar);
                        } else if (packets->packet->length < 0x10000) {
                                curchar |= 1;
-                               putchar_func(ctx, curchar);
-                               putchar_func(ctx, packets->packet->length >> 8);
-                               putchar_func(ctx,
-                                       packets->packet->length & 0xFF);
+                               putchar_func(ctx, 1, &curchar);
+                               curchar = packets->packet->length >> 8;
+                               putchar_func(ctx, 1, &curchar);
+                               curchar = packets->packet->length & 0xFF;
+                               putchar_func(ctx, 1, &curchar);
                        } else {
                                curchar |= 2;
-                               putchar_func(ctx, curchar);
-                               putchar_func(ctx,
-                                       packets->packet->length >> 24);
-                               putchar_func(ctx,
-                                       (packets->packet->length >> 16) & 0xFF);
-                               putchar_func(ctx,
-                                       (packets->packet->length >> 8) & 0xFF);
-                               putchar_func(ctx,
-                                       packets->packet->length & 0xFF);
+                               putchar_func(ctx, 1, &curchar);
+                               curchar = packets->packet->length >> 24;
+                               putchar_func(ctx, 1, &curchar);
+                               curchar = (packets->packet->length >> 16) & 0xFF;
+                               putchar_func(ctx, 1, &curchar);
+                               curchar = (packets->packet->length >> 8) & 0xFF;
+                               putchar_func(ctx, 1, &curchar);
+                               curchar = packets->packet->length & 0xFF;
+                               putchar_func(ctx, 1, &curchar);
                        }
                }
 
-               for (i = 0; i < packets->packet->length; i++) {
-                       putchar_func(ctx, packets->packet->data[i]);
-               }
+               putchar_func(ctx, packets->packet->length, packets->packet->data);
+//             for (i = 0; i < packets->packet->length; i++) {
+//                     putchar_func(ctx, packets->packet->data[i]);
+//             }
                packets = packets->next;
        }
        return 0;