X-Git-Url: http://the.earth.li/gitweb/?p=onak.git;a=blobdiff_plain;f=parsekey.c;h=49b91bfee2c5183cf0794ec187f4e451cf700621;hp=fb9cf83e25b0ce33c0a0a4b2e454cebd04c179d6;hb=743957a08f068529d3add3e8485678b4e5034195;hpb=394938c479925750ffe56c28d281945ba4003a14 diff --git a/parsekey.c b/parsekey.c index fb9cf83..49b91bf 100644 --- a/parsekey.c +++ b/parsekey.c @@ -1,22 +1,31 @@ /* * parsekey.c - Routines to parse an OpenPGP key. * - * Jonathan McDowell + * Copyright 2002-2004,2007-2008,2011 Jonathan McDowell * - * Copyright 2002 Project Purple + * This program is free software: you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for + * more details. + * + * You should have received a copy of the GNU General Public License along with + * this program. If not, see . */ -#include #include #include #include #include -#include "keyid.h" #include "keystructs.h" #include "ll.h" -#include "log.h" #include "mem.h" +#include "onak.h" +#include "openpgp.h" #include "parsekey.h" /** @@ -46,13 +55,13 @@ int parse_keys(struct openpgp_packet_list *packets, while (packets != NULL) { switch (packets->packet->tag) { - case 2: + case OPENPGP_PACKET_SIGNATURE: /* * 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); + if (curkey == NULL) + return ONAK_E_INVALID_PARAM; if (curkey->subkeys != NULL) { ADD_PACKET_TO_LIST_END(curkey->last_subkey, sig, @@ -63,11 +72,30 @@ int parse_keys(struct openpgp_packet_list *packets, packet_dup(packets->packet)); } else { ADD_PACKET_TO_LIST_END(curkey, - revocation, + sig, 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] == + OPENPGP_SIGTYPE_KEY_REV) { + /* + * Type 3 key, 0x20 == revocation + */ + curkey->revoked = true; + } else if (packets->packet->data[0] == 4 && + packets->packet->data[1] == + OPENPGP_SIGTYPE_KEY_REV) { + /* + * Type 4 key, 0x20 == revocation + */ + curkey->revoked = true; + } } break; - case 6: + case OPENPGP_PACKET_PUBLICKEY: /* * It's a public key packet, so start a new key in our * list. @@ -83,28 +111,31 @@ int parse_keys(struct openpgp_packet_list *packets, curkey->publickey = packet_dup(packets->packet); count++; break; - case 13: - case 17: + case OPENPGP_PACKET_UID: + case OPENPGP_PACKET_UAT: /* * It's a UID packet (or a photo id, which is similar). */ - assert(curkey != NULL); - assert(curkey->subkeys == NULL); + if (curkey == NULL) + return ONAK_E_INVALID_PARAM; + if (curkey->subkeys != NULL) + return ONAK_E_INVALID_PARAM; ADD_PACKET_TO_LIST_END(curkey, uid, packet_dup(packets->packet)); break; - case 14: + case OPENPGP_PACKET_PUBLICSUBKEY: /* * It's a subkey packet. */ - assert(curkey != NULL); + if (curkey == NULL) + return ONAK_E_INVALID_PARAM; ADD_PACKET_TO_LIST_END(curkey, subkey, packet_dup(packets->packet)); break; - case 12: - case 61: + case OPENPGP_PACKET_TRUST: + case OPENPGP_PACKET_COMMENT: /* * One of: * @@ -113,9 +144,8 @@ int parse_keys(struct openpgp_packet_list *packets, */ break; default: - logthing(LOGTHING_ERROR, - "Unsupported packet type: %d", - packets->packet->tag); + /* Unsupported packet. Do what? Ignore for now. */ + break; } packets = packets->next; } @@ -133,7 +163,7 @@ int parse_keys(struct openpgp_packet_list *packets, */ int debug_packet(struct openpgp_packet *packet) { - printf("\tNew format: %d, Tag: %u, Length: %d\n", + printf("\tNew format: %d, Tag: %u, Length: %zd\n", packet->newformat, packet->tag, packet->length); @@ -152,19 +182,20 @@ int debug_packet(struct openpgp_packet *packet) * packet stream and reads the packets into a linked list of packets * ready for parsing as a public key or whatever. */ -int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count, - unsigned char *c), +onak_status_t read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count, + void *c), void *ctx, struct openpgp_packet_list **packets, int maxnum) { unsigned char curchar = 0; - struct openpgp_packet_list *curpacket = NULL; - int rc = 0; + struct openpgp_packet_list *curpacket = NULL, **packetend = NULL; + onak_status_t rc = ONAK_E_OK; int keys = 0; - bool inpacket = false; - assert(packets != NULL); + if (packets == NULL) + return ONAK_E_INVALID_PARAM; + curpacket = *packets; if (curpacket != NULL) { while (curpacket->next != NULL) { @@ -172,20 +203,20 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count, } } - while (!rc && (maxnum == 0 || keys < maxnum) && + while (rc == ONAK_E_OK && (maxnum == 0 || keys < maxnum) && !getchar_func(ctx, 1, &curchar)) { - if (!inpacket && (curchar & 0x80)) { + if (curchar & 0x80) { /* - * New packet. Record the fact we're in a packet and - * allocate memory for it. + * New packet. Allocate memory for it. */ - inpacket = true; if (curpacket != NULL) { curpacket->next = malloc(sizeof (*curpacket)); + packetend = &curpacket->next; curpacket = curpacket->next; } else { *packets = curpacket = malloc(sizeof (*curpacket)); + packetend = packets; } memset(curpacket, 0, sizeof(*curpacket)); curpacket->packet = @@ -200,7 +231,10 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count, */ if (curpacket->packet->newformat) { curpacket->packet->tag = (curchar & 0x3F); - rc = getchar_func(ctx, 1, &curchar); + if (getchar_func(ctx, 1, &curchar)) { + rc = ONAK_E_INVALID_PKT; + break; + } curpacket->packet->length = curchar; if (curpacket->packet->length > 191 && curpacket->packet->length < 224) { @@ -211,86 +245,168 @@ 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) { - logthing(LOGTHING_NOTICE, - "Partial length;" - " not supported."); + free(curpacket->packet); + curpacket->packet = NULL; + rc = ONAK_E_UNSUPPORTED_FEATURE; } else if (curpacket->packet->length == 255) { /* * 5 byte length; ie 255 followed by 3 * bytes of MSB length. */ - rc = getchar_func(ctx, 1, &curchar); + if (getchar_func(ctx, 1, &curchar)) { + rc = ONAK_E_INVALID_PKT; + break; + } curpacket->packet->length = curchar; curpacket->packet->length <<= 8; - rc = getchar_func(ctx, 1, &curchar); + if (getchar_func(ctx, 1, &curchar)) { + rc = ONAK_E_INVALID_PKT; + break; + } curpacket->packet->length += curchar; curpacket->packet->length <<= 8; - rc = getchar_func(ctx, 1, &curchar); + if (getchar_func(ctx, 1, &curchar)) { + rc = ONAK_E_INVALID_PKT; + break; + } curpacket->packet->length += curchar; curpacket->packet->length <<= 8; - rc = getchar_func(ctx, 1, &curchar); + if (getchar_func(ctx, 1, &curchar)) { + rc = ONAK_E_INVALID_PKT; + break; + } curpacket->packet->length += curchar; } } else { curpacket->packet->tag = (curchar & 0x3C) >> 2; switch (curchar & 3) { case 0: - rc = getchar_func(ctx, 1, &curchar); + if (getchar_func(ctx, 1, &curchar)) { + rc = ONAK_E_INVALID_PKT; + break; + } curpacket->packet->length = curchar; break; case 1: - rc = getchar_func(ctx, 1, &curchar); + if (getchar_func(ctx, 1, &curchar)) { + rc = ONAK_E_INVALID_PKT; + break; + } curpacket->packet->length = curchar; curpacket->packet->length <<= 8; - rc = getchar_func(ctx, 1, &curchar); + if (getchar_func(ctx, 1, &curchar)) { + rc = ONAK_E_INVALID_PKT; + break; + } curpacket->packet->length += curchar; break; case 2: - rc = getchar_func(ctx, 1, &curchar); + if (getchar_func(ctx, 1, &curchar)) { + rc = ONAK_E_INVALID_PKT; + break; + } curpacket->packet->length = - (curchar << 24); - rc = getchar_func(ctx, 1, &curchar); + ((unsigned) curchar << 24); + if (getchar_func(ctx, 1, &curchar)) { + rc = ONAK_E_INVALID_PKT; + break; + } curpacket->packet->length += (curchar << 16); - rc = getchar_func(ctx, 1, &curchar); + if (getchar_func(ctx, 1, &curchar)) { + rc = ONAK_E_INVALID_PKT; + break; + } curpacket->packet->length += (curchar << 8); - rc = getchar_func(ctx, 1, &curchar); + if (getchar_func(ctx, 1, &curchar)) { + rc = ONAK_E_INVALID_PKT; + break; + } curpacket->packet->length += curchar; break; case 3: - logthing(LOGTHING_ERROR, - "Unsupported length type 3."); - curpacket->packet->length = 0; - curpacket->packet->data = NULL; - rc = -1; + rc = ONAK_E_UNSUPPORTED_FEATURE; + free(curpacket->packet); + curpacket->packet = NULL; break; } } if (rc == 0) { - if (curpacket->packet->tag == 6) { + if (curpacket->packet->tag == + OPENPGP_PACKET_PUBLICKEY) { keys++; } curpacket->packet->data = malloc(curpacket->packet->length * sizeof(unsigned char)); if (curpacket->packet->data == NULL) { - logthing(LOGTHING_ERROR, - "Can't allocate memory for " - "packet!"); - rc = -1; + rc = ONAK_E_NOMEM; } else { rc = getchar_func(ctx, curpacket->packet->length, curpacket->packet->data); } } - inpacket = false; } else { - logthing(LOGTHING_ERROR, "Unexpected character: 0x%X", - curchar); - rc = 1; + rc = ONAK_E_INVALID_PKT; + } + if (rc == ONAK_E_OK) { + /* Make sure the packet version is sane */ + switch (curpacket->packet->tag) { + case OPENPGP_PACKET_ENCRYPTED_MDC: + /* These packets must be v1 */ + if (curpacket->packet->data[0] != 1) { + rc = ONAK_E_INVALID_PKT; + } + break; + case OPENPGP_PACKET_PKSESSIONKEY: + case OPENPGP_PACKET_ONEPASSSIG: + /* These packets must be v3 */ + if (curpacket->packet->data[0] != 3) { + rc = ONAK_E_INVALID_PKT; + } + break; + case OPENPGP_PACKET_SYMSESSIONKEY: + /* These packets must be v4 */ + if (curpacket->packet->data[0] != 4) { + rc = ONAK_E_INVALID_PKT; + } + break; + case OPENPGP_PACKET_SIGNATURE: + case OPENPGP_PACKET_SECRETKEY: + case OPENPGP_PACKET_PUBLICKEY: + /* Must be v2 -> v5 */ + if (curpacket->packet->data[0] < 2 || + curpacket->packet->data[0] > 5) { + rc = ONAK_E_INVALID_PKT; + } + break; + default: + break; + } + } + } + + if (packetend != NULL) { + if ((*packetend)->packet != NULL) { + /* If we got an invalid final packet, discard it. */ + if ((*packetend)->packet->data != NULL && + rc != ONAK_E_OK) { + free((*packetend)->packet->data); + (*packetend)->packet->data = NULL; + } + /* If we didn't get any data, clean it up. */ + if ((*packetend)->packet->data == NULL) { + free((*packetend)->packet); + (*packetend)->packet = NULL; + } + } + /* Trim the last packet if it doesn't actually exist */ + if ((*packetend)->packet == NULL) { + free(*packetend); + *packetend = NULL; } } @@ -306,8 +422,8 @@ 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, size_t count, - unsigned char *c), +onak_status_t write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count, + void *c), void *ctx, struct openpgp_packet_list *packets) { @@ -334,8 +450,6 @@ int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count, 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); @@ -355,8 +469,7 @@ int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count, curchar &= 0xFF; putchar_func(ctx, 1, &curchar); } else { - logthing(LOGTHING_ERROR, - "Unsupported new format length."); + return ONAK_E_UNSUPPORTED_FEATURE; } } else { curchar |= (packets->packet->tag << 2); @@ -389,7 +502,8 @@ int write_openpgp_stream(int (*putchar_func)(void *ctx, size_t count, packets->packet->data); packets = packets->next; } - return 0; + + return ONAK_E_OK; } /** @@ -417,9 +531,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));