X-Git-Url: http://the.earth.li/gitweb/?a=blobdiff_plain;f=merge.c;h=be97eb4782b32f5550f8f63a6db0db87d858c9ac;hb=d1e174344cb2d8d3681cd3c3d6dfe0c70d60da20;hp=87f45fca642cba3c1e1eaec9a5788181b5c828b9;hpb=567528bebc2dd1a8ccb672d11b22cbe71b292deb;p=onak.git

diff --git a/merge.c b/merge.c
index 87f45fc..be97eb4 100644
--- a/merge.c
+++ b/merge.c
@@ -43,15 +43,19 @@ bool compare_packets(struct openpgp_packet *a, struct openpgp_packet *b)
  */
 bool compare_signatures(struct openpgp_packet *a, struct openpgp_packet *b)
 {
+	uint64_t a_keyid, b_keyid;
+	time_t a_creation, b_creation;
+
 	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));
+		sig_info(a, &a_keyid, &a_creation);
+		sig_info(b, &b_keyid, &b_creation);
+		return (a_creation == b_creation) && (a_keyid == b_keyid);
 	}
 }