X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/0f4971d043c38bae1bfb95201622a1405110f899..1a72b8d85895fc9ffba0d8f6a9240634ce6ee8dc:/decodekey.c?ds=sidebyside diff --git a/decodekey.c b/decodekey.c index 9ae614d..606b091 100644 --- a/decodekey.c +++ b/decodekey.c @@ -1,14 +1,9 @@ /* * decodekey.c - Routines to further decode an OpenPGP key. * - * Jonathan McDowell - * - * Copyright 2002 Project Purple - * - * $Id: decodekey.c,v 1.2 2003/06/04 20:57:07 noodles Exp $ + * Copyright 2002-2008 Jonathan McDowell */ -#include #include #include #include @@ -20,23 +15,26 @@ #include "keyid.h" #include "keystructs.h" #include "ll.h" +#include "log.h" /* * parse_subpackets - Parse the subpackets of a Type 4 signature. * @data: The subpacket data. - * @keyid: A pointer to where we should return the keyid. + * @keyid: A pointer to where we should return the keyid. + * @creationtime: A pointer to where we should return the creation time. * * This function parses the subkey data of a Type 4 signature and fills * in the supplied variables. It also returns the length of the data - * processed. + * processed. If the value of any piece of data is not desired a NULL + * can be passed instead of a pointer to a storage area for that value. */ -int parse_subpackets(unsigned char *data, uint64_t *keyid) +int parse_subpackets(unsigned char *data, uint64_t *keyid, time_t *creation) { int offset = 0; int length = 0; int packetlen = 0; - assert(data != NULL); + log_assert(data != NULL); length = (data[0] << 8) + data[1] + 2; @@ -55,34 +53,56 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid) packetlen <<= 8; packetlen = data[offset++]; } - switch (data[offset]) { + switch (data[offset] & 0x7F) { case 2: /* - * Signature creation time. Might want to output this? + * Signature creation time. */ + if (creation != NULL) { + *creation = data[offset + packetlen - 4]; + *creation <<= 8; + *creation = data[offset + packetlen - 3]; + *creation <<= 8; + *creation = data[offset + packetlen - 2]; + *creation <<= 8; + *creation = data[offset + packetlen - 1]; + } break; - case 0x83: + case 3: /* * Signature expiration time. Might want to output this? */ break; + case 6: + /* + * Regular expression for UIDs this sig is over. + */ + break; case 16: - *keyid = data[offset+packetlen - 8]; - *keyid <<= 8; - *keyid += data[offset+packetlen - 7]; - *keyid <<= 8; - *keyid += data[offset+packetlen - 6]; - *keyid <<= 8; - *keyid += data[offset+packetlen - 5]; - *keyid <<= 8; - *keyid += data[offset+packetlen - 4]; - *keyid <<= 8; - *keyid += data[offset+packetlen - 3]; - *keyid <<= 8; - *keyid += data[offset+packetlen - 2]; - *keyid <<= 8; - *keyid += data[offset+packetlen - 1]; + if (keyid != NULL) { + *keyid = data[offset+packetlen - 8]; + *keyid <<= 8; + *keyid += data[offset+packetlen - 7]; + *keyid <<= 8; + *keyid += data[offset+packetlen - 6]; + *keyid <<= 8; + *keyid += data[offset+packetlen - 5]; + *keyid <<= 8; + *keyid += data[offset+packetlen - 4]; + *keyid <<= 8; + *keyid += data[offset+packetlen - 3]; + *keyid <<= 8; + *keyid += data[offset+packetlen - 2]; + *keyid <<= 8; + *keyid += data[offset+packetlen - 1]; + } + break; + case 20: + /* + * Annotation data. + */ break; + case 23: /* * Key server preferences. Including no-modify. @@ -93,13 +113,22 @@ int parse_subpackets(unsigned char *data, uint64_t *keyid) * Primary UID. */ break; + case 26: + /* + * Policy URI. + */ + break; default: /* * We don't care about unrecognized packets unless bit - * 7 is set in which case we prefer an error than - * ignoring it. + * 7 is set in which case we log a major error. */ - assert(!(data[offset] & 0x80)); + if (data[offset] & 0x80) { + logthing(LOGTHING_CRITICAL, + "Critical subpacket type not parsed: 0x%X", + data[offset]); + } + } offset += packetlen; } @@ -130,42 +159,55 @@ struct ll *keysigs(struct ll *curll, } /** - * sig_keyid - Return the keyid for a given OpenPGP signature packet. - * @packet: The signature packet. + * sig_info - Get info on a given OpenPGP signature packet + * @packet: The signature packet + * @keyid: A pointer for where to return the signature keyid + * @creation: A pointer for where to return the signature creation time * - * Returns the keyid for the supplied signature packet. + * Gets any info about a signature packet; parses the subpackets for a v4 + * key or pulls the data directly from v2/3. NULL can be passed for any + * values which aren't cared about. */ -uint64_t sig_keyid(struct openpgp_packet *packet) +void sig_info(struct openpgp_packet *packet, uint64_t *keyid, time_t *creation) { int length = 0; - uint64_t keyid = 0; if (packet != NULL) { - keyid = 0; switch (packet->data[0]) { case 2: case 3: - keyid = packet->data[7]; - keyid <<= 8; - keyid += packet->data[8]; - keyid <<= 8; - keyid += packet->data[9]; - keyid <<= 8; - keyid += packet->data[10]; - keyid <<= 8; - keyid += packet->data[11]; - keyid <<= 8; - keyid += packet->data[12]; - keyid <<= 8; - keyid += packet->data[13]; - keyid <<= 8; - keyid += packet->data[14]; + if (keyid != NULL) { + *keyid = packet->data[7]; + *keyid <<= 8; + *keyid += packet->data[8]; + *keyid <<= 8; + *keyid += packet->data[9]; + *keyid <<= 8; + *keyid += packet->data[10]; + *keyid <<= 8; + *keyid += packet->data[11]; + *keyid <<= 8; + *keyid += packet->data[12]; + *keyid <<= 8; + *keyid += packet->data[13]; + *keyid <<= 8; + *keyid += packet->data[14]; + } + if (creation != NULL) { + *creation = packet->data[3]; + *creation <<= 8; + *creation = packet->data[4]; + *creation <<= 8; + *creation = packet->data[5]; + *creation <<= 8; + *creation = packet->data[6]; + } break; case 4: length = parse_subpackets(&packet->data[4], - &keyid); + keyid, creation); parse_subpackets(&packet->data[length + 4], - &keyid); + keyid, creation); /* * Don't bother to look at the unsigned packets. */ @@ -175,9 +217,25 @@ uint64_t sig_keyid(struct openpgp_packet *packet) } } + return; +} + +/** + * sig_keyid - Return the keyid for a given OpenPGP signature packet. + * @packet: The signature packet. + * + * Returns the keyid for the supplied signature packet. + */ +uint64_t sig_keyid(struct openpgp_packet *packet) +{ + uint64_t keyid = 0; + + sig_info(packet, &keyid, NULL); + return keyid; } + /* * TODO: Abstract out; all our linked lists should be generic and then we can * llsize them. @@ -207,6 +265,10 @@ char **keyuids(struct openpgp_publickey *key, char **primary) char buf[1024]; char **uids = NULL; int count = 0; + + if (primary != NULL) { + *primary = NULL; + } if (key != NULL && key->uids != NULL) { uids = malloc((spsize(key->uids) + 1) * sizeof (char *)); @@ -223,13 +285,41 @@ char **keyuids(struct openpgp_publickey *key, char **primary) curuid = curuid -> next; } uids[count] = NULL; - } - /* - * TODO: Parse subpackets for real primary ID (v4 keys) - */ - if (primary != NULL) { - *primary = uids[0]; + + /* + * TODO: Parse subpackets for real primary ID (v4 keys) + */ + if (primary != NULL) { + *primary = uids[0]; + } } return uids; } + +/** + * keysubkeys - Takes a key and returns an array of its subkey keyids. + * @key: The key to get the subkeys of. + * + * keysubkeys takes a public key structure and returns an array of the + * subkey keyids for that key. + */ +uint64_t *keysubkeys(struct openpgp_publickey *key) +{ + struct openpgp_signedpacket_list *cursubkey = NULL; + uint64_t *subkeys = NULL; + int count = 0; + + if (key != NULL && key->subkeys != NULL) { + subkeys = malloc((spsize(key->subkeys) + 1) * + sizeof (uint64_t)); + cursubkey = key->subkeys; + while (cursubkey != NULL) { + subkeys[count++] = get_packetid(cursubkey->packet); + cursubkey = cursubkey -> next; + } + subkeys[count] = 0; + } + + return subkeys; +}