modified so match falls back to keyID if fingerprint not null on either side, relates to github #1868

dghgit · dghgit · commit d7afc761d896 · 2024-10-17T06:02:37.000+11:00
diff --git a/pg/src/main/java/org/bouncycastle/bcpg/KeyIdentifier.java b/pg/src/main/java/org/bouncycastle/bcpg/KeyIdentifier.java
@@ -146,7 +146,7 @@ public boolean matches(KeyIdentifier other)
             return true;
         }
 
-        if (fingerprint != null)
+        if (fingerprint != null && other.fingerprint != null)
         {
             return Arrays.constantTimeAreEqual(fingerprint, other.fingerprint);
         }

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public boolean matches(KeyIdentifier other)`
`146`	`146`	`return true;`
`147`	`147`	`}`
`148`	`148`
`149`		`- if (fingerprint != null)`
	`149`	`+ if (fingerprint != null && other.fingerprint != null)`
`150`	`150`	`{`
`151`	`151`	`return Arrays.constantTimeAreEqual(fingerprint, other.fingerprint);`
`152`	`152`	`}`