X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/05d5b193ee05a187d4f3fd05a4be1fbb6bf937b6..bf52d4344cd29ab86c1d5981d2ea4d1717eb2f84:/merge.c

diff --git a/merge.c b/merge.c
index c51474c..4379596 100644
--- a/merge.c
+++ b/merge.c
@@ -3,12 +3,9 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
- *
- * $Id: merge.c,v 1.11 2003/06/07 13:45:35 noodles Exp $
+ * Copyright 2002-2005 Project Purple
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -46,7 +43,16 @@ bool compare_packets(struct openpgp_packet *a, struct openpgp_packet *b)
  */
 bool compare_signatures(struct openpgp_packet *a, struct openpgp_packet *b)
 {
-	return (sig_keyid(a) == sig_keyid(b));
+	if (a->data[0] != b->data[0]) {
+		/* Different signature versions, so not the same */
+		return false;
+	} else if (a->data[0] == 4 && a->data[1] != b->data[1]) {
+		/* Type 4 signature, but different types */
+		return false;
+	/* TODO: Check signature time? */
+	} else {
+		return (sig_keyid(a) == sig_keyid(b));
+	}
 }
 
 /**
@@ -176,7 +182,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
 	struct openpgp_packet_list	*curpacket = NULL;
 	struct openpgp_packet_list	*nextpacket = NULL;
 
-	assert(compare_packets(old->packet, new->packet));
+	log_assert(compare_packets(old->packet, new->packet));
 
 	curpacket = new->sigs;
 	while (curpacket != NULL) {
@@ -196,7 +202,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
 			if (lastpacket != NULL) {
 				lastpacket->next = curpacket->next;
 			} else {
-				assert(curpacket == new->sigs);
+				log_assert(curpacket == new->sigs);
 				new->sigs = curpacket->next;
 			}
 			curpacket->next = NULL;
@@ -321,7 +327,7 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
 				if (lastpacket != NULL) {
 					lastpacket->next = curpacket->next;
 				} else {
-					assert(curpacket == b->revocations);
+					log_assert(curpacket == b->revocations);
 					b->revocations = curpacket->next;
 				}
 				curpacket->next = NULL;
@@ -355,68 +361,3 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
 
 	return rc;
 }
-
-/**
- *	update_keys - Takes a list of public keys and updates them in the DB.
- *	@keys: The keys to update in the DB.
- *
- *	Takes a list of keys and adds them to the database, merging them with
- *	the key in the database if it's already present there. The key list is
- *	update to contain the minimum set of updates required to get from what
- *	we had before to what we have now (ie the set of data that was added to
- *	the DB). Returns the number of entirely new keys added.
- */
-int update_keys(struct openpgp_publickey **keys)
-{
-	struct openpgp_publickey *curkey = NULL;
-	struct openpgp_publickey *oldkey = NULL;
-	struct openpgp_publickey *prev = NULL;
-	int newkeys = 0;
-	bool intrans;
-
-	for (curkey = *keys; curkey != NULL; curkey = curkey->next) {
-		intrans = starttrans();
-		logthing(LOGTHING_INFO,
-			"Fetching key 0x%llX, result: %d",
-			get_keyid(curkey),
-			fetch_key(get_keyid(curkey), &oldkey, intrans));
-
-		/*
-		 * If we already have the key stored in the DB then merge it
-		 * with the new one that's been supplied. Otherwise the key
-		 * we've just got is the one that goes in the DB and also the
-		 * one that we send out.
-		 */
-		if (oldkey != NULL) {
-			merge_keys(oldkey, curkey);
-			if (curkey->revocations == NULL &&
-					curkey->uids == NULL &&
-					curkey->subkeys == NULL) {
-				if (prev == NULL) {
-					*keys = curkey->next;
-				} else {
-					prev->next = curkey->next;
-					curkey->next = NULL;
-					free_publickey(curkey);
-					curkey = prev;
-				}
-			} else {
-				prev = curkey;
-				logthing(LOGTHING_INFO,
-					"Merged key; storing updated key.");
-				store_key(oldkey, intrans, true);
-			}
-			free_publickey(oldkey);
-			oldkey = NULL;
-		} else {
-			logthing(LOGTHING_INFO,
-				"Storing completely new key.");
-			store_key(curkey, intrans, false);
-			newkeys++;
-		}
-		endtrans();
-		intrans = false;
-	}
-
-	return newkeys;
-}