]> git.sommitrealweird.co.uk Git - onak.git/blobdiff - parsekey.c
cscvs to tla changeset 85
[onak.git] / parsekey.c
index f83e8051015cb38cbbf0c1197854c0724b5397cc..0f02e8cf757f8839f2fd609c151e7d2202412aec 100644 (file)
@@ -4,6 +4,8 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
+ *
+ * $Id: parsekey.c,v 1.8 2003/06/08 19:04:32 noodles Exp $
  */
 
 #include <assert.h>
@@ -15,6 +17,7 @@
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"
+#include "log.h"
 #include "mem.h"
 #include "parsekey.h"
 
@@ -39,11 +42,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 +97,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:
@@ -120,13 +129,14 @@ int parse_keys(struct openpgp_packet_list *packets,
                         */
                        break;
                default:
-                       fprintf(stderr, "Unsupported packet type: %d\n",
+                       logthing(LOGTHING_ERROR,
+                                       "Unsupported packet type: %d",
                                        packets->packet->tag);
                }
                packets = packets->next;
        }
 
-       return 0;
+       return count;
 }
 
 /**
@@ -193,7 +203,9 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 
                        curpacket->packet->newformat = (curchar & 0x40);
 
-                       // TODO: Better error checking on getchar_func.
+                       /*
+                        * TODO: Better error checking on getchar_func.
+                        */
                        if (curpacket->packet->newformat) {
                                curpacket->packet->tag = (curchar & 0x3F);
                                rc = getchar_func(ctx, 1, &curchar);
@@ -253,18 +265,26 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                        curpacket->packet->length += curchar;
                                        break;
                                case 3:
-                                       fprintf(stderr, "Unsupported length type 3.\n");
+                                       logthing(LOGTHING_ERROR,
+                                               "Unsupported length type 3.");
+                                       curpacket->packet->length = 0;
+                                       curpacket->packet->data = NULL;
+                                       rc = -1;
                                        break;
                                }
                        }
-                       curpacket->packet->data =
-                               malloc(curpacket->packet->length *
+
+                       if (rc == 0) {
+                               curpacket->packet->data =
+                                       malloc(curpacket->packet->length *
                                        sizeof(unsigned char));
-                       rc = getchar_func(ctx, curpacket->packet->length,
+                               rc = getchar_func(ctx,
+                                       curpacket->packet->length,
                                        curpacket->packet->data);
+                       }
                        inpacket = false;
                } else {
-                       fprintf(stderr, "Unexpected character: 0x%X\n",
+                       logthing(LOGTHING_ERROR, "Unexpected character: 0x%X",
                                curchar);
                }
        }
@@ -281,64 +301,65 @@ 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);
+                               logthing(LOGTHING_ERROR,
+                                       "Unsupported new format length.");
                        }
                } 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);
                packets = packets->next;
        }
        return 0;