X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/4b8483ae278577a3adc8d84da81d77019704466f..523633cb1b66234daa431f71278041f511046f00:/parsekey.c?ds=inline diff --git a/parsekey.c b/parsekey.c index df77493..0367e2d 100644 --- a/parsekey.c +++ b/parsekey.c @@ -4,6 +4,8 @@ * Jonathan McDowell * * Copyright 2002 Project Purple + * + * $Id: parsekey.c,v 1.20 2004/05/27 21:55:38 noodles Exp $ */ #include @@ -15,23 +17,10 @@ #include "keyid.h" #include "keystructs.h" #include "ll.h" +#include "log.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. @@ -39,11 +28,23 @@ 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 + * 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) { @@ -82,6 +83,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: @@ -103,14 +105,24 @@ int parse_keys(struct openpgp_packet_list *packets, subkey, packet_dup(packets->packet)); break; + case 12: + case 61: + /* + * One of: + * + * Trust packet. Ignore. + * Comment packet. Ignore. + */ + break; default: - printf("Unsupported packet type: %d\n", + logthing(LOGTHING_ERROR, + "Unsupported packet type: %d", packets->packet->tag); } packets = packets->next; } - return 0; + return count; } /** @@ -123,7 +135,7 @@ int parse_keys(struct openpgp_packet_list *packets, */ int debug_packet(struct openpgp_packet *packet) { - printf("\tNew format: %d, Tag: %d, Length: %d\n", + printf("\tNew format: %d, Tag: %u, Length: %d\n", packet->newformat, packet->tag, packet->length); @@ -136,6 +148,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. + * @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 @@ -144,24 +157,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, - struct openpgp_packet_list **packets) + struct openpgp_packet_list **packets, + int maxnum) { unsigned char curchar = 0; - unsigned long count = 0; struct openpgp_packet_list *curpacket = NULL; int rc = 0; + int keys = 0; bool inpacket = false; 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; - count = 0; if (curpacket != NULL) { curpacket->next = malloc(sizeof (*curpacket)); curpacket = curpacket->next; @@ -177,7 +197,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); @@ -191,8 +213,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) { - 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. @@ -201,15 +225,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 += 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 = curchar; + curpacket->packet->length += curchar; } - } else { curpacket->packet->tag = (curchar & 0x3C) >> 2; switch (curchar & 3) { @@ -225,22 +248,51 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count, 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: - printf("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) { + if (curpacket->packet->tag == 6) { + keys++; + } + curpacket->packet->data = + malloc(curpacket->packet->length * 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 { - fprintf(stderr, "Unexpected character: 0x%X\n", + logthing(LOGTHING_ERROR, "Unexpected character: 0x%X", curchar); + rc = 1; } } @@ -256,64 +308,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. */ -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 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 { - 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;