]> git.sommitrealweird.co.uk Git - onak.git/blobdiff - parsekey.c
Update the copy of my key to my 4096R one
[onak.git] / parsekey.c
index df7749389f33858569b29fab698391fb72d9b390..a0c0311aec1e98fa1fb0294d92562f7055958a62 100644 (file)
@@ -6,7 +6,6 @@
  * Copyright 2002 Project Purple
  */
 
  * Copyright 2002 Project Purple
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"
+#include "log.h"
 #include "mem.h"
 #include "parsekey.h"
 
 #include "mem.h"
 #include "parsekey.h"
 
-/**
- *     add_key - Takes a key and adds it to the keyserver.
- *     @key: The public key to add.
- *
- *     This function takes a public key and adds it to the keyserver.
- *     It first of all sees if we already have the key locally. If we do then
- *     we retrieve it and merge the two keys. We then store the resulting key
- *     (or just the original we received if we don't already have it). We then
- *     send out the appropriate updates to our keyserver peers.
- */
-int add_key(struct openpgp_publickey *key) {
-       return 0;
-}
-
 /**
  *     parse_keys - Process a stream of packets for public keys + sigs.
  *     @packets: The packet list to parse.
 /**
  *     parse_keys - Process a stream of packets for public keys + sigs.
  *     @packets: The packet list to parse.
@@ -39,21 +25,32 @@ 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.
  *
  *     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 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
+        * so we add to the end of the list.
+        */
+       for (curkey = *keys; curkey != NULL && curkey->next != NULL;
+                       curkey = curkey->next) ;
 
        while (packets != NULL) {
                switch (packets->packet->tag) {
                case 2:
                        /*
                         * It's a signature packet. Add it to either the public
 
        while (packets != NULL) {
                switch (packets->packet->tag) {
                case 2:
                        /*
                         * It's a signature packet. Add it to either the public
-                        * key (it should be a revocation), to the current UID
-                        * or the current subkey.
+                        * key, to the current UID or the current subkey.
                         */
                         */
-                       assert(curkey != NULL);
+                       log_assert(curkey != NULL);
                        if (curkey->subkeys != NULL) {
                                ADD_PACKET_TO_LIST_END(curkey->last_subkey,
                                        sig,
                        if (curkey->subkeys != NULL) {
                                ADD_PACKET_TO_LIST_END(curkey->last_subkey,
                                        sig,
@@ -64,8 +61,25 @@ int parse_keys(struct openpgp_packet_list *packets,
                                        packet_dup(packets->packet));
                        } else {
                                ADD_PACKET_TO_LIST_END(curkey,
                                        packet_dup(packets->packet));
                        } else {
                                ADD_PACKET_TO_LIST_END(curkey,
-                                       revocation,
+                                       sig,
                                        packet_dup(packets->packet));
                                        packet_dup(packets->packet));
+                               /*
+                                * This is a signature on the public key; check
+                                * if it's a revocation.
+                                */
+                               if (packets->packet->data[0] == 3 &&
+                                       packets->packet->data[2] == 0x20) {
+                                       /*
+                                        * Type 3 key, 0x20 == revocation
+                                        */
+                                       curkey->revoked = true;
+                               } else if (packets->packet->data[0] == 4 &&
+                                       packets->packet->data[1] == 0x20) {
+                                       /*
+                                        * Type 4 key, 0x20 == revocation
+                                        */
+                                       curkey->revoked = true;
+                               }
                        }
                        break;
                case 6:
                        }
                        break;
                case 6:
@@ -82,14 +96,15 @@ int parse_keys(struct openpgp_packet_list *packets,
                        }
                        memset(curkey, 0, sizeof(*curkey));
                        curkey->publickey = packet_dup(packets->packet);
                        }
                        memset(curkey, 0, sizeof(*curkey));
                        curkey->publickey = packet_dup(packets->packet);
+                       count++;
                        break;
                case 13:
                case 17:
                        /*
                         * It's a UID packet (or a photo id, which is similar).
                         */
                        break;
                case 13:
                case 17:
                        /*
                         * It's a UID packet (or a photo id, which is similar).
                         */
-                       assert(curkey != NULL);
-                       assert(curkey->subkeys == NULL);
+                       log_assert(curkey != NULL);
+                       log_assert(curkey->subkeys == NULL);
                        ADD_PACKET_TO_LIST_END(curkey,
                                uid,
                                packet_dup(packets->packet));
                        ADD_PACKET_TO_LIST_END(curkey,
                                uid,
                                packet_dup(packets->packet));
@@ -98,19 +113,29 @@ int parse_keys(struct openpgp_packet_list *packets,
                        /*
                         * It's a subkey packet.
                         */
                        /*
                         * It's a subkey packet.
                         */
-                       assert(curkey != NULL);
+                       log_assert(curkey != NULL);
                        ADD_PACKET_TO_LIST_END(curkey,
                                subkey,
                                packet_dup(packets->packet));
                        break;
                        ADD_PACKET_TO_LIST_END(curkey,
                                subkey,
                                packet_dup(packets->packet));
                        break;
+               case 12:
+               case 61:
+                       /*
+                        * One of:
+                        *
+                        * Trust packet. Ignore.
+                        * Comment packet. Ignore.
+                        */
+                       break;
                default:
                default:
-                       printf("Unsupported packet type: %d\n",
+                       logthing(LOGTHING_ERROR,
+                                       "Unsupported packet type: %d",
                                        packets->packet->tag);
                }
                packets = packets->next;
        }
 
                                        packets->packet->tag);
                }
                packets = packets->next;
        }
 
-       return 0;
+       return count;
 }
 
 /**
 }
 
 /**
@@ -123,7 +148,7 @@ int parse_keys(struct openpgp_packet_list *packets,
  */
 int debug_packet(struct openpgp_packet *packet)
 {
  */
 int debug_packet(struct openpgp_packet *packet)
 {
-       printf("\tNew format: %d, Tag: %d, Length: %d\n",
+       printf("\tNew format: %d, Tag: %u, Length: %zd\n",
                        packet->newformat,
                        packet->tag,
                        packet->length);
                        packet->newformat,
                        packet->tag,
                        packet->length);
@@ -136,6 +161,7 @@ int debug_packet(struct openpgp_packet *packet)
  *     @getchar_func: The function to get the next character from the stream.
  *     @ctx: A pointer to the context structure for getchar_func.
  *     @packets: The outputted list of packets.
  *     @getchar_func: The function to get the next character from the stream.
  *     @ctx: A pointer to the context structure for getchar_func.
  *     @packets: The outputted list of packets.
+ *     @maxnum: The maximum number of keys to read. 0 means unlimited.
  *
  *     This function uses getchar_func to read characters from an OpenPGP
  *     packet stream and reads the packets into a linked list of packets
  *
  *     This function uses getchar_func to read characters from an OpenPGP
  *     packet stream and reads the packets into a linked list of packets
@@ -144,24 +170,31 @@ int debug_packet(struct openpgp_packet *packet)
 int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                unsigned char *c),
                                void *ctx,
 int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                unsigned char *c),
                                void *ctx,
-                               struct openpgp_packet_list **packets)
+                               struct openpgp_packet_list **packets,
+                               int maxnum)
 {
        unsigned char                    curchar = 0;
 {
        unsigned char                    curchar = 0;
-       unsigned long                    count = 0;
        struct openpgp_packet_list      *curpacket = NULL;
        int                              rc = 0;
        struct openpgp_packet_list      *curpacket = NULL;
        int                              rc = 0;
+       int                              keys = 0;
        bool                             inpacket = false;
 
        bool                             inpacket = false;
 
-       assert(packets != NULL);
+       log_assert(packets != NULL);
+       curpacket = *packets;
+       if (curpacket != NULL) {
+               while (curpacket->next != NULL) {
+                       curpacket = curpacket->next;
+               }
+       }
 
 
-       while (!rc && !getchar_func(ctx, 1, &curchar)) {
+       while (!rc && (maxnum == 0 || keys < maxnum) &&
+                       !getchar_func(ctx, 1, &curchar)) {
                if (!inpacket && (curchar & 0x80)) {
                        /*
                         * New packet. Record the fact we're in a packet and
                         * allocate memory for it.
                         */
                        inpacket = true;
                if (!inpacket && (curchar & 0x80)) {
                        /*
                         * New packet. Record the fact we're in a packet and
                         * allocate memory for it.
                         */
                        inpacket = true;
-                       count = 0;
                        if (curpacket != NULL) {
                                curpacket->next = malloc(sizeof (*curpacket));
                                curpacket = curpacket->next;
                        if (curpacket != NULL) {
                                curpacket->next = malloc(sizeof (*curpacket));
                                curpacket = curpacket->next;
@@ -177,7 +210,9 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
 
                        curpacket->packet->newformat = (curchar & 0x40);
 
 
                        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);
                        if (curpacket->packet->newformat) {
                                curpacket->packet->tag = (curchar & 0x3F);
                                rc = getchar_func(ctx, 1, &curchar);
@@ -191,8 +226,10 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                        curpacket->packet->length += 192;
                                } else if (curpacket->packet->length > 223 &&
                                        curpacket->packet->length < 255) {
                                        curpacket->packet->length += 192;
                                } else if (curpacket->packet->length > 223 &&
                                        curpacket->packet->length < 255) {
-                                       printf("Partial length; not supported.\n");
-                               } else {
+                                       logthing(LOGTHING_NOTICE,
+                                               "Partial length;"
+                                               " not supported.");
+                               } else if (curpacket->packet->length == 255) {
                                        /*
                                         * 5 byte length; ie 255 followed by 3
                                         * bytes of MSB length.
                                        /*
                                         * 5 byte length; ie 255 followed by 3
                                         * bytes of MSB length.
@@ -201,15 +238,14 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                        curpacket->packet->length = curchar;
                                        curpacket->packet->length <<= 8;
                                        rc = getchar_func(ctx, 1, &curchar);
                                        curpacket->packet->length = curchar;
                                        curpacket->packet->length <<= 8;
                                        rc = getchar_func(ctx, 1, &curchar);
-                                       curpacket->packet->length = curchar;
+                                       curpacket->packet->length += curchar;
                                        curpacket->packet->length <<= 8;
                                        rc = getchar_func(ctx, 1, &curchar);
                                        curpacket->packet->length <<= 8;
                                        rc = getchar_func(ctx, 1, &curchar);
-                                       curpacket->packet->length = curchar;
+                                       curpacket->packet->length += curchar;
                                        curpacket->packet->length <<= 8;
                                        rc = getchar_func(ctx, 1, &curchar);
                                        curpacket->packet->length <<= 8;
                                        rc = getchar_func(ctx, 1, &curchar);
-                                       curpacket->packet->length = curchar;
+                                       curpacket->packet->length += curchar;
                                }
                                }
-
                        } else {
                                curpacket->packet->tag = (curchar & 0x3C) >> 2;
                                switch (curchar & 3) {
                        } else {
                                curpacket->packet->tag = (curchar & 0x3C) >> 2;
                                switch (curchar & 3) {
@@ -225,22 +261,51 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count,
                                        curpacket->packet->length += curchar;
                                        break;
                                case 2:
                                        curpacket->packet->length += curchar;
                                        break;
                                case 2:
-                                       printf("Unsupported length type 2.\n");
+                                       rc = getchar_func(ctx, 1, &curchar);
+                                       curpacket->packet->length = 
+                                               (curchar << 24);
+                                       rc = getchar_func(ctx, 1, &curchar);
+                                       curpacket->packet->length +=
+                                               (curchar << 16);
+                                       rc = getchar_func(ctx, 1, &curchar);
+                                       curpacket->packet->length +=
+                                               (curchar << 8);
+                                       rc = getchar_func(ctx, 1, &curchar);
+                                       curpacket->packet->length += curchar;
                                        break;
                                case 3:
                                        break;
                                case 3:
-                                       printf("Unsupported length type 3.\n");
+                                       logthing(LOGTHING_ERROR,
+                                               "Unsupported length type 3.");
+                                       curpacket->packet->length = 0;
+                                       curpacket->packet->data = NULL;
+                                       rc = -1;
                                        break;
                                }
                        }
                                        break;
                                }
                        }
-                       curpacket->packet->data =
-                               malloc(curpacket->packet->length *
+
+                       if (rc == 0) {
+                               if (curpacket->packet->tag == 6) {
+                                       keys++;
+                               }
+                               curpacket->packet->data =
+                                       malloc(curpacket->packet->length *
                                        sizeof(unsigned char));
                                        sizeof(unsigned char));
-                       rc = getchar_func(ctx, curpacket->packet->length,
-                                       curpacket->packet->data);
+                               if (curpacket->packet->data == NULL) {
+                                       logthing(LOGTHING_ERROR, 
+                                               "Can't allocate memory for "
+                                               "packet!");
+                                       rc = -1;
+                               } else {
+                                       rc = getchar_func(ctx,
+                                               curpacket->packet->length,
+                                               curpacket->packet->data);
+                               }
+                       }
                        inpacket = false;
                } else {
                        inpacket = false;
                } else {
-                       fprintf(stderr, "Unexpected character: 0x%X\n",
+                       logthing(LOGTHING_ERROR, "Unexpected character: 0x%X",
                                curchar);
                                curchar);
+                       rc = 1;
                }
        }
 
                }
        }
 
@@ -256,64 +321,87 @@ 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.
  */
  *     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;
                                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;
 
        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) {
 
                        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) {
                        } 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 if (packets->packet->length > 8382 &&
+                               packets->packet->length < 0xFFFFFFFF) {
+                               logthing(LOGTHING_DEBUG,
+                                       "Writing 5 byte length");
+                               curchar = 255;
+                               putchar_func(ctx, 1, &curchar);
+                               
+                               curchar = (packets->packet->length >> 24);
+                               curchar &= 0xFF;
+                               putchar_func(ctx, 1, &curchar);
+                               
+                               curchar = (packets->packet->length >> 16);
+                               curchar &= 0xFF;
+                               putchar_func(ctx, 1, &curchar);
+                               
+                               curchar = (packets->packet->length >> 8);
+                               curchar &= 0xFF;
+                               putchar_func(ctx, 1, &curchar);
+                               
+                               curchar = packets->packet->length;
+                               curchar &= 0xFF;
+                               putchar_func(ctx, 1, &curchar);
                        } else {
                        } 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) {
                        }
                } 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;
                        } 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;
                        } 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;
                packets = packets->next;
        }
        return 0;
@@ -344,9 +432,9 @@ int flatten_publickey(struct openpgp_publickey *key,
                }
 
                /*
                }
 
                /*
-                * Now do any revocation signatures on the main key.
+                * Now do any signatures on the main key.
                 */
                 */
-               for (tmplist = key->revocations; tmplist != NULL;
+               for (tmplist = key->sigs; tmplist != NULL;
                                tmplist = tmplist->next) {
                        ADD_PACKET_TO_LIST((*list_end),
                                        packet_dup(tmplist->packet));
                                tmplist = tmplist->next) {
                        ADD_PACKET_TO_LIST((*list_end),
                                        packet_dup(tmplist->packet));