X-Git-Url: https://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.c;h=353a844e6de9a1d346e7f102d7872b4378206137;hb=e0dd4d10f385cd19da389ec66622eea8aa66ae59;hp=9dcbf4d20fc3c784df361cb68e6c6a2d8ec5dac2;hpb=f81196236e05340a025e94f65830793c3d60401d;p=onak.git

diff --git a/merge.c b/merge.c
index 9dcbf4d..353a844 100644
--- a/merge.c
+++ b/merge.c
@@ -327,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.
 		 */