X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/6bcfac5f53de9dff2f646da360b7da1a6e3aa7c1..a241edc87bed49d6bc5dc3c4c99786a921ae7c8a:/keyid.c diff --git a/keyid.c b/keyid.c index 34ab145..a7051f2 100644 --- a/keyid.c +++ b/keyid.c @@ -1,20 +1,34 @@ /* * keyid.c - Routines to calculate key IDs. * - * Jonathan McDowell + * Copyright 2002,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. * - * $Id: keyid.c,v 1.9 2004/05/29 02:52:56 noodles Exp $ + * 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, write to the Free Software Foundation, Inc., 51 + * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#include #include +#include #include "keyid.h" #include "keystructs.h" #include "log.h" +#include "parsekey.h" #include "md5.h" -#include "sha.h" +#include "mem.h" +#include "merge.h" +#include "sha1.h" /** @@ -40,60 +54,55 @@ unsigned char *get_fingerprint(struct openpgp_packet *packet, unsigned char *fingerprint, size_t *len) { - SHA1_CONTEXT sha_ctx; - MD5_CONTEXT md5_ctx; + SHA1_CTX sha_ctx; + struct md5_ctx md5_context; unsigned char c; - unsigned char *buff = NULL; size_t modlen, explen; - assert(fingerprint != NULL); - assert(len != NULL); + log_assert(fingerprint != NULL); + log_assert(len != NULL); *len = 0; switch (packet->data[0]) { case 2: case 3: - md5_init(&md5_ctx); + md5_init_ctx(&md5_context); /* * MD5 the modulus and exponent. */ modlen = ((packet->data[8] << 8) + packet->data[9] + 7) >> 3; - md5_write(&md5_ctx, &packet->data[10], modlen); + md5_process_bytes(&packet->data[10], modlen, &md5_context); explen = ((packet->data[10+modlen] << 8) + packet->data[11+modlen] + 7) >> 3; - md5_write(&md5_ctx, &packet->data[12 + modlen], explen); - - md5_final(&md5_ctx); - buff = md5_read(&md5_ctx); + md5_process_bytes(&packet->data[12 + modlen], explen, + &md5_context); + md5_finish_ctx(&md5_context, fingerprint); *len = 16; - memcpy(fingerprint, buff, *len); break; case 4: - sha1_init(&sha_ctx); + SHA1Init(&sha_ctx); /* * TODO: Can this be 0x99? Are all public key packets old * format with 2 bytes of length data? */ c = 0x99; - sha1_write(&sha_ctx, &c, sizeof(c)); + SHA1Update(&sha_ctx, &c, sizeof(c)); c = packet->length >> 8; - sha1_write(&sha_ctx, &c, sizeof(c)); + SHA1Update(&sha_ctx, &c, sizeof(c)); c = packet->length & 0xFF; - sha1_write(&sha_ctx, &c, sizeof(c)); - sha1_write(&sha_ctx, packet->data, + SHA1Update(&sha_ctx, &c, sizeof(c)); + SHA1Update(&sha_ctx, packet->data, packet->length); - sha1_final(&sha_ctx); - buff = sha1_read(&sha_ctx); - + SHA1Final(fingerprint, &sha_ctx); *len = 20; - memcpy(fingerprint, buff, *len); + break; default: logthing(LOGTHING_ERROR, "Unknown key type: %d", @@ -116,7 +125,7 @@ uint64_t get_packetid(struct openpgp_packet *packet) size_t length = 0; unsigned char buff[20]; - assert(packet != NULL); + log_assert(packet != NULL); switch (packet->data[0]) { case 2: @@ -163,3 +172,88 @@ uint64_t get_packetid(struct openpgp_packet *packet) return keyid; } + +static struct openpgp_packet_list *sortpackets(struct openpgp_packet_list + *packets) +{ + struct openpgp_packet_list *sorted, **cur, *next; + + sorted = NULL; + while (packets != NULL) { + cur = &sorted; + while (*cur != NULL && compare_packets((*cur)->packet, + packets->packet) < 0) { + cur = &((*cur)->next); + } + next = *cur; + *cur = packets; + packets = packets->next; + (*cur)->next = next; + } + + return sorted; +} + +void get_skshash(struct openpgp_publickey *key, struct skshash *hash) +{ + struct openpgp_packet_list *packets = NULL, *list_end = NULL; + struct openpgp_packet_list *curpacket; + struct md5_ctx md5_context; + struct openpgp_publickey *next; + uint32_t tmp; + + /* + * We only want a single key, so clear any link to the next + * one for the period during the flatten. + */ + next = key->next; + key->next = NULL; + flatten_publickey(key, &packets, &list_end); + key->next = next; + packets = sortpackets(packets); + + md5_init_ctx(&md5_context); + + for (curpacket = packets; curpacket != NULL; + curpacket = curpacket->next) { + tmp = htonl(curpacket->packet->tag); + md5_process_bytes(&tmp, sizeof(tmp), &md5_context); + tmp = htonl(curpacket->packet->length); + md5_process_bytes(&tmp, sizeof(tmp), &md5_context); + md5_process_bytes(curpacket->packet->data, + curpacket->packet->length, + &md5_context); + } + + md5_finish_ctx(&md5_context, &hash->hash); + free_packet_list(packets); +} + +uint8_t hexdigit(char c) +{ + if (c >= '0' && c <= '9') + return c - '0'; + else if (c >= 'a' && c <= 'f') + return c - 'a' + 10; + else if (c >= 'A' && c <= 'F') + return c - 'A' + 10; + else + return 0; +} + +int parse_skshash(char *search, struct skshash *hash) +{ + int i, len; + + len = strlen(search); + if (len > 32) { + return 0; + } + + for (i = 0; i < len; i += 2) { + hash->hash[i >> 1] = (hexdigit(search[i]) << 4) + + hexdigit(search[i + 1]); + } + + return 1; +}