Add support for calculating SKS style key hashes
[onak.git] / keyid.c
diff --git a/keyid.c b/keyid.c
index 34ab145df0bb0c847ed015896686ce237251cb9b..0516f477e028eac7d7fb584be15a90259c106dfb 100644 (file)
--- a/keyid.c
+++ b/keyid.c
@@ -4,17 +4,19 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: keyid.c,v 1.9 2004/05/29 02:52:56 noodles Exp $
  */
 
 #include <sys/types.h>
+#include <arpa/inet.h>
 
 #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 +42,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 +113,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 +160,59 @@ 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);
+}