X-Git-Url: https://the.earth.li/gitweb/?p=onak.git;a=blobdiff_plain;f=merge.c;h=9d03411cde1f3a8eaba108b0fc51c917e152dde5;hp=be97eb4782b32f5550f8f63a6db0db87d858c9ac;hb=76f079e5ebdb34acaaa2462a8d915ee06d3c8425;hpb=d1e174344cb2d8d3681cd3c3d6dfe0c70d60da20

diff --git a/merge.c b/merge.c
index be97eb4..9d03411 100644
--- a/merge.c
+++ b/merge.c
@@ -1,36 +1,59 @@
 /*
  * merge.c - Routines to merge OpenPGP public keys.
  *
- * Jonathan McDowell <noodles@earth.li>
+ * Copyright 2002-2005,2007,2011 Jonathan McDowell <noodles@earth.li>
  *
- * Copyright 2002-2005 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.
+ *
+ * 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, see <https://www.gnu.org/licenses/>.
  */
 
+#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"
+#include "onak.h"
 
 /**
  *	compare_packets - Check to see if 2 OpenPGP packets are the same.
  *	@a: The first packet to compare.
  *	@b: The second packet to compare.
  *
- *	Takes 2 packets and returns true if they are the same and false
- *	otherwise.
+ *	Takes 2 packets and returns 0 if they are the same, -1 if a is
+ *      less than b, or 1 if a is greater than b.
  */
-bool compare_packets(struct openpgp_packet *a, struct openpgp_packet *b)
+int compare_packets(struct openpgp_packet *a, struct openpgp_packet *b)
 {
-	return (a->tag == b->tag && a->length == b->length &&
-		!memcmp(a->data, b->data, b->length));
+	int ret, len;
+
+	if (a->tag > b->tag) {
+		ret = 1;
+	} else if (b->tag > a->tag) {
+		ret = -1;
+	} else {
+		len = (a->length < b->length) ? a->length : b->length;
+		ret = memcmp(a->data, b->data, len);
+		if (ret == 0 && a->length != b->length) {
+			ret = (a->length < b->length) ? -1 : 1;
+		}
+	}
+
+	return ret;
 }
 
 /**
@@ -73,7 +96,7 @@ bool find_packet(struct openpgp_packet_list *packet_list,
 	bool found = false;
 
 	while (!found && packet_list != NULL) {
-		if (compare_packets(packet_list->packet, packet)) {
+		if (compare_packets(packet_list->packet, packet) == 0) {
 			found = true;
 		}
 		packet_list = packet_list -> next;
@@ -122,7 +145,7 @@ struct openpgp_signedpacket_list *find_signed_packet(
 	struct openpgp_signedpacket_list *found = NULL;
 
 	while (found == NULL && packet_list != NULL) {
-		if (compare_packets(packet_list->packet, packet)) {
+		if (compare_packets(packet_list->packet, packet) == 0) {
 			found = packet_list;
 		}
 		packet_list = packet_list -> next;
@@ -140,17 +163,15 @@ struct openpgp_signedpacket_list *find_signed_packet(
  *	removes it if found. Assumes the packet can only exist a maximum of
  *	once in the list.
  */
-bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
+static void remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
 		struct openpgp_signedpacket_list **list_end,
 		struct openpgp_packet *packet)
 {
 	struct openpgp_signedpacket_list *cur = NULL;
 	struct openpgp_signedpacket_list *prev = NULL;
-	bool found = false;
 
-	for (cur = *packet_list; !found && (cur != NULL); cur = cur->next) {
-		if (compare_packets(cur->packet, packet)) {
-			found = true;
+	for (cur = *packet_list; cur != NULL; cur = cur->next) {
+		if (compare_packets(cur->packet, packet) == 0) {
 			if (prev == NULL) {
 				*packet_list = cur->next;
 			} else {
@@ -159,14 +180,14 @@ bool remove_signed_packet(struct openpgp_signedpacket_list **packet_list,
 			if (cur->next == NULL) {
 				*list_end = prev;
 			}
-			/*
-			 * TODO: Free the removed signed packet...
-			 */
+			cur->next = NULL;
+			free_signedpacket_list(cur);
+			break;
 		}
 		prev = cur;
 	}
 
-	return found;
+	return;
 }
 
 /**
@@ -186,7 +207,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
 	struct openpgp_packet_list	*curpacket = NULL;
 	struct openpgp_packet_list	*nextpacket = NULL;
 
-	log_assert(compare_packets(old->packet, new->packet));
+	assert(compare_packets(old->packet, new->packet) == 0);
 
 	curpacket = new->sigs;
 	while (curpacket != NULL) {
@@ -206,7 +227,7 @@ int merge_packet_sigs(struct openpgp_signedpacket_list *old,
 			if (lastpacket != NULL) {
 				lastpacket->next = curpacket->next;
 			} else {
-				log_assert(curpacket == new->sigs);
+				assert(curpacket == new->sigs);
 				new->sigs = curpacket->next;
 			}
 			curpacket->next = NULL;
@@ -303,13 +324,20 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
 	struct openpgp_packet_list	*curpacket = NULL; 
 	struct openpgp_packet_list	*lastpacket = NULL;
 	struct openpgp_packet_list	*nextpacket = NULL;
+	uint64_t keya, keyb;
 
 	if (a == NULL || b == NULL) {
 		/*
 		 * Do nothing.
 		 */
-		rc = 1;
-	} else if (get_keyid(a) != get_keyid(b)) {
+		return 1;
+	}
+
+	if (get_keyid(a, &keya) != ONAK_E_OK) {
+		return 1;
+	} else if (get_keyid(b, &keyb) != ONAK_E_OK) {
+		return 1;
+	} else if (keya != keyb) {
 		/*
 		 * Key IDs are different.
 		 */
@@ -331,7 +359,7 @@ int merge_keys(struct openpgp_publickey *a, struct openpgp_publickey *b)
 				if (lastpacket != NULL) {
 					lastpacket->next = curpacket->next;
 				} else {
-					log_assert(curpacket == b->sigs);
+					assert(curpacket == b->sigs);
 					b->sigs = curpacket->next;
 				}
 				curpacket->next = NULL;