X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/aabf2c1bd3e37fb70b674dba243f927069909534..076ef5c84d05a564ed8031ced310336b3b331dfe:/keyid.c?ds=sidebyside

diff --git a/keyid.c b/keyid.c
index 5149fd6..29c61f0 100644
--- a/keyid.c
+++ b/keyid.c
@@ -4,17 +4,19 @@
  * Jonathan McDowell <noodles@earth.li>
  *
  * Copyright 2002 Project Purple
- *
- * $Id: keyid.c,v 1.10 2004/05/31 22:04:51 noodles Exp $
  */
 
+#include <string.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
 
-#include "assert.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "log.h"
+#include "parsekey.h"
 #include "md5.h"
+#include "mem.h"
+#include "merge.h"
 #include "sha1.h"
 
 
@@ -46,8 +48,8 @@ unsigned char *get_fingerprint(struct openpgp_packet *packet,
 	unsigned char c;
 	size_t         modlen, explen;
 
-	assert(fingerprint != NULL);
-	assert(len != NULL);
+	log_assert(fingerprint != NULL);
+	log_assert(len != NULL);
 
 	*len = 0;
 
@@ -112,7 +114,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:
@@ -159,3 +161,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;
+}