PGPainless
/
cert-d-pgpainless
mirror of https://codeberg.org/PGPainless/cert-d-pgpainless.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare certs based on encoding

This commit is contained in:
Paul Schaub 2022-09-01 11:18:08 +02:00
parent 76a5a91fe0
commit f109b598f6
Signed by: vanitasvitae
GPG Key ID: 62BEE9264BF17311
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pgpainless-cert-d/src/main/java/org/pgpainless/certificate_store/MergeCallbacks.java
View File

@ -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));