X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/4b8483ae278577a3adc8d84da81d77019704466f..7969830aa1b588dce09752db3ac5a3d780397d48:/merge.c?ds=inline

diff --git a/merge.c b/merge.c
index c1410e1..95abbba 100644
--- a/merge.c
+++ b/merge.c
@@ -3,25 +3,29 @@
  *
  * Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002 Project Purple
+ * Copyright 2002-2004 Project Purple
  */
 
-#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
+#include "decodekey.h"
+#include "keydb.h"
 #include "keyid.h"
 #include "keystructs.h"
 #include "ll.h"
+#include "log.h"
 #include "mem.h"
 #include "merge.h"
 
 /**
  *	compare_packets - Check to see if 2 OpenPGP packets are the same.
- *	@a: The first key to compare.
- *	@b: The second key to compare.
+ *	@a: The first packet to compare.
+ *	@b: The second packet to compare.
  *
- *	Takes 2 keys and returns true if they are the same and false otherwise.
+ *	Takes 2 packets and returns true if they are the same and false
+ *	otherwise.
  */
 bool compare_packets(struct openpgp_packet *a, struct openpgp_packet *b)
 {
@@ -29,6 +33,19 @@ bool compare_packets(struct openpgp_packet *a, struct openpgp_packet *b)
 		!memcmp(a->data, b->data, b->length));
 }
 
+/**
+ *	compare_signatures - Check to see if 2 OpenPGP signatures are the same.
+ *	@a: The first signature to compare.
+ *	@b: The second signature to compare.
+ *
+ *	Takes 2 signature packets and returns true if they are the same and
+ *	false otherwise.
+ */
+bool compare_signatures(struct openpgp_packet *a, struct openpgp_packet *b)
+{
+	return (sig_keyid(a) == sig_keyid(b));
+}
+
 /**
  *	find_packet - Checks to see if an OpenPGP packet exists in a list.
  *	@packet_list: The list of packets to look in.
@@ -52,6 +69,31 @@ bool find_packet(struct openpgp_packet_list *packet_list,
 	return found;
 }
 
+/**
+ *	find_signature - Checks to see if an OpenPGP signature exists in a list.
+ *	@packet_list: The list of packets to look in.
+ *	@packet: The signature to look for.
+ *
+ *	Walks through the packet_list checking to see if the signature given is
+ *	present in it. Returns a pointer to it if it is, NULL otherwise.
+ *
+ */
+struct openpgp_packet_list *find_signature(
+			struct openpgp_packet_list *packet_list,
+			struct openpgp_packet *packet)
+{
+	struct openpgp_packet_list *found = NULL;
+
+	while (!found && packet_list != NULL) {
+		if (compare_signatures(packet_list->packet, packet)) {
+			found = packet_list;
+		}
+		packet_list = packet_list -> next;
+	}
+
+	return found;
+}
+
 /**
  *	get_signed_packet - Gets a signed packet from a list.
  *	@packet_list: The list of packets to look in.
@@ -104,7 +146,11 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
 			if (cur->next == NULL) {
 				*list_end = prev;
 			}
+			/*
+			 * TODO: Free the removed signed packet...
+			 */
 		}
+		prev = cur;
 	}
 
 	return found;
@@ -127,12 +173,18 @@ 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) {
 		nextpacket = curpacket->next;
-		if (find_packet(old->sigs, curpacket->packet)) {
+		/*
+		 * TODO: We should be checking the signature and then
+		 * potentially merging/replacing it depending on the subpackets
+		 * really. For now this stops us adding the same one twice
+		 * however.
+		 */ 
+		if (find_signature(old->sigs, curpacket->packet)) {
 			/*
 			 * We already have this sig, remove it from the
 			 * difference list and free the memory allocated for
@@ -141,7 +193,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;
@@ -191,25 +243,29 @@ int merge_signed_packets(struct openpgp_signedpacket_list **old,
 			if (newelem->sigs == NULL) {
 				remove_signed_packet(new,
 						new_end,
-						curelem->packet);
+						newelem->packet);
 			}
 		}
 	}
 
 	/*
-	 * If *new != NULL now then there are UIDs on the new key that weren't
-	 * on the old key. Add them.
+	 * If *new != NULL now then there might be UIDs on the new key that
+	 * weren't on the old key. Walk through them, checking if the UID is
+	 * on the old key and if not adding them to it.
 	 */
 	for (curelem = *new; curelem != NULL;
 			curelem = curelem->next) {
-		ADD_PACKET_TO_LIST((*old_end),
+
+		if (find_signed_packet(*old, curelem->packet) == NULL) {
+			ADD_PACKET_TO_LIST((*old_end),
 				packet_dup(curelem->packet));
-		if (*old == NULL) {
-			*old = *old_end;
-		}
-		packet_list_add(&(*old_end)->sigs,
+			if (*old == NULL) {
+				*old = *old_end;
+			}
+			packet_list_add(&(*old_end)->sigs,
 				&(*old_end)->last_sig,
 				curelem->sigs);
+		}
 	}
 
 	return 0;
@@ -262,7 +318,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;
@@ -289,7 +345,7 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
 		 */
 		merge_signed_packets(&a->uids, &a->last_uid, 
 				&b->uids, &b->last_uid);
-		merge_signed_packets(&a->subkeys, &a->last_uid,
+		merge_signed_packets(&a->subkeys, &a->last_subkey,
 				&b->subkeys, &b->last_subkey);
 
 	}