From f109b598f6cf415b12378aa1dcf88a401d02c915 Mon Sep 17 00:00:00 2001
From: Paul Schaub <vanitasvitae@fsfe.org>
Date: Thu, 1 Sep 2022 11:18:08 +0200
Subject: [PATCH] Compare certs based on encoding

---
 .../org/pgpainless/certificate_store/MergeCallbacks.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/MergeCallbacks.java b/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/MergeCallbacks.java
index cbd3a44..000e935 100644
--- a/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/MergeCallbacks.java
+++ b/pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/MergeCallbacks.java
@@ -16,6 +16,7 @@ import pgp.certificate_store.certificate.KeyMaterialMerger;
 import pgp.certificate_store.exception.BadDataException;
 
 import java.io.IOException;
+import java.util.Arrays;
 import java.util.Iterator;
 
 public class MergeCallbacks {
@@ -107,7 +108,7 @@ public class MergeCallbacks {
                 }
             }
 
-            private void printOutDifferences(PGPKeyRing existingCert, PGPKeyRing mergedCert) {
+            private void printOutDifferences(PGPKeyRing existingCert, PGPKeyRing mergedCert) throws IOException {
                 int numSigsBefore = countSigs(existingCert);
                 int numSigsAfter = countSigs(mergedCert);
                 int newSigs = numSigsAfter - numSigsBefore;
@@ -115,7 +116,7 @@ public class MergeCallbacks {
                 int numUidsAfter = count(mergedCert.getPublicKey().getUserIDs());
                 int newUids = numUidsAfter - numUidsBefore;
 
-                if (!existingCert.equals(mergedCert)) {
+                if (!Arrays.equals(existingCert.getEncoded(), mergedCert.getEncoded())) {
                     OpenPgpFingerprint fingerprint = OpenPgpFingerprint.of(mergedCert);
                     StringBuilder sb = new StringBuilder();
                     sb.append(String.format("Certificate %s has", fingerprint));