X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/ec10586ae774074490665d5baeef8488861904ee..f9917d386685c7f641d493dbc78eb3eb41fb24bd:/parsekey.c diff --git a/parsekey.c b/parsekey.c index 0367e2d..a0c0311 100644 --- a/parsekey.c +++ b/parsekey.c @@ -4,11 +4,8 @@ * Jonathan McDowell * * Copyright 2002 Project Purple - * - * $Id: parsekey.c,v 1.20 2004/05/27 21:55:38 noodles Exp $ */ -#include #include #include #include @@ -51,10 +48,9 @@ int parse_keys(struct openpgp_packet_list *packets, 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, @@ -65,8 +61,25 @@ 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] == 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: @@ -90,8 +103,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)); @@ -100,7 +113,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)); @@ -135,7 +148,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); @@ -166,7 +179,7 @@ int read_openpgp_stream(int (*getchar_func)(void *ctx, size_t count, int keys = 0; bool inpacket = false; - assert(packets != NULL); + log_assert(packets != NULL); curpacket = *packets; if (curpacket != NULL) { while (curpacket->next != NULL) { @@ -419,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));