X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/32851537d44f08b08ed317cbc4281ce003f84fa4..4d1212e60c60d000bc289e197fc0dccf98285bb1:/parsekey.c?ds=sidebyside diff --git a/parsekey.c b/parsekey.c index a98e8cc..687fd9b 100644 --- a/parsekey.c +++ b/parsekey.c @@ -4,11 +4,8 @@ * Jonathan McDowell * * Copyright 2002 Project Purple - * - * $Id: parsekey.c,v 1.9 2003/09/28 21:07:49 noodles Exp $ */ -#include #include #include #include @@ -21,20 +18,6 @@ #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. @@ -68,7 +51,7 @@ int parse_keys(struct openpgp_packet_list *packets, * key (it should be a revocation), 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, @@ -104,8 +87,8 @@ int parse_keys(struct openpgp_packet_list *packets, /* * 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)); @@ -114,7 +97,7 @@ int parse_keys(struct openpgp_packet_list *packets, /* * It's a subkey packet. */ - assert(curkey != NULL); + log_assert(curkey != NULL); ADD_PACKET_TO_LIST_END(curkey, subkey, packet_dup(packets->packet)); @@ -149,7 +132,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); @@ -162,6 +145,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 @@ -170,24 +154,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); + 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; - count = 0; if (curpacket != NULL) { curpacket->next = malloc(sizeof (*curpacket)); curpacket = curpacket->next; @@ -219,7 +210,9 @@ 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"); + logthing(LOGTHING_NOTICE, + "Partial length;" + " not supported."); } else if (curpacket->packet->length == 255) { /* * 5 byte length; ie 255 followed by 3 @@ -229,13 +222,13 @@ 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; @@ -275,6 +268,9 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count, } if (rc == 0) { + if (curpacket->packet->tag == 6) { + keys++; + } curpacket->packet->data = malloc(curpacket->packet->length * sizeof(unsigned char)); @@ -293,6 +289,7 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count, } else { logthing(LOGTHING_ERROR, "Unexpected character: 0x%X", curchar); + rc = 1; } } @@ -334,6 +331,28 @@ int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count, 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 { logthing(LOGTHING_ERROR, "Unsupported new format length.");