X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/blobdiff_plain/b3fb0618da777d1ce58418ab36bc4321f5cf77ef..94ffe75fd3251c74320167cf94604e73fdb99dfc:/merge.c

diff --git a/merge.c b/merge.c
index 118e757..353a844 100644
--- a/merge.c
+++ b/merge.c
@@ -1,9 +1,20 @@
 /*
  * 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, write to the Free Software Foundation, Inc., 51
+ * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include <stdio.h>
@@ -316,13 +327,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.
 		 */