Add PGPPublicKey.hasFingerprint method (reduce allocations)

peterdettman · peterdettman · commit 95e806339e9d · 2024-04-10T16:24:36.000+07:00
diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPublicKey.java b/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPublicKey.java
@@ -337,11 +337,12 @@ public long getKeyID()
      */
     public byte[] getFingerprint()
     {
-        byte[]    tmp = new byte[fingerprint.length];
-        
-        System.arraycopy(fingerprint, 0, tmp, 0, tmp.length);
-        
-        return tmp;
+        return Arrays.clone(fingerprint);
+    }
+
+    public boolean hasFingerprint(byte[] fingerprint)
+    {
+        return Arrays.areEqual(this.fingerprint, fingerprint);
     }
     
     /**
diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPublicKeyRing.java b/pg/src/main/j2me/org/bouncycastle/openpgp/PGPPublicKeyRing.java
@@ -15,7 +15,6 @@
 import org.bouncycastle.bcpg.PublicKeyPacket;
 import org.bouncycastle.bcpg.TrustPacket;
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
-import org.bouncycastle.util.Arrays;
 
 /**
  * Class to hold a single master public key and its subkeys.
@@ -135,7 +134,7 @@ public PGPPublicKey getPublicKey(byte[] fingerprint)
         {
             PGPPublicKey    k = (PGPPublicKey)keys.get(i);
 
-            if (Arrays.areEqual(fingerprint, k.getFingerprint()))
+            if (k.hasFingerprint(fingerprint))
             {
                 return k;
             }
diff --git a/pg/src/main/j2me/org/bouncycastle/openpgp/PGPSecretKeyRing.java b/pg/src/main/j2me/org/bouncycastle/openpgp/PGPSecretKeyRing.java
@@ -20,7 +20,6 @@
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
 import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor;
-import org.bouncycastle.util.Arrays;
 
 /**
  * Class to hold a single master secret key and its subkeys.
@@ -185,7 +184,7 @@ public PGPPublicKey getPublicKey(byte[] fingerprint)
         {
             PGPPublicKey    k = (PGPPublicKey)keys.get(i);
 
-            if (Arrays.areEqual(fingerprint, k.getFingerprint()))
+            if (k.hasFingerprint(fingerprint))
             {
                 return k;
             }
@@ -262,7 +261,7 @@ public PGPSecretKey getSecretKey(byte[] fingerprint)
         {
             PGPSecretKey    k = (PGPSecretKey)keys.get(i);
 
-            if (Arrays.areEqual(fingerprint, k.getPublicKey().getFingerprint()))
+            if (k.getPublicKey().hasFingerprint(fingerprint))
             {
                 return k;
             }
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKey.java b/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKey.java
@@ -415,11 +415,12 @@ public long getKeyID()
      */
     public byte[] getFingerprint()
     {
-        byte[] tmp = new byte[fingerprint.length];
-
-        System.arraycopy(fingerprint, 0, tmp, 0, tmp.length);
+        return Arrays.clone(fingerprint);
+    }
 
-        return tmp;
+    public boolean hasFingerprint(byte[] fingerprint)
+    {
+        return Arrays.areEqual(this.fingerprint, fingerprint);
     }
 
     /**
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyRing.java b/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyRing.java
@@ -23,7 +23,6 @@
 import org.bouncycastle.bcpg.TrustPacket;
 import org.bouncycastle.bcpg.UserDataPacket;
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
-import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.Iterable;
 import org.bouncycastle.util.Longs;
 
@@ -184,7 +183,7 @@ public PGPPublicKey getPublicKey(byte[] fingerprint)
         {
             PGPPublicKey k = (PGPPublicKey)keys.get(i);
 
-            if (Arrays.areEqual(fingerprint, k.getFingerprint()))
+            if (k.hasFingerprint(fingerprint))
             {
                 return k;
             }
@@ -478,7 +477,7 @@ public static PGPPublicKeyRing join(
         boolean allowSubkeySigsOnNonSubkey)
         throws PGPException
     {
-        if (!Arrays.areEqual(first.getPublicKey().getFingerprint(), second.getPublicKey().getFingerprint()))
+        if (!second.getPublicKey().hasFingerprint(first.getPublicKey().getFingerprint()))
         {
             throw new IllegalArgumentException("Cannot merge certificates with differing primary keys.");
         }
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyRingCollection.java b/pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyRingCollection.java
@@ -278,7 +278,7 @@ public PGPPublicKey getPublicKey(
     }
 
     /**
-     * Return the PGP public key associated with the given key fingerprint.
+     * Return the public key ring which contains the key associated with the given key fingerprint.
      *
      * @param fingerprint the public key fingerprint to match against.
      * @return the PGP public key ring containing the PGP public key matching fingerprint.
diff --git a/pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKeyRing.java b/pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKeyRing.java
@@ -24,7 +24,6 @@
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
 import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor;
-import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.Iterable;
 
 /**
@@ -246,7 +245,7 @@ public PGPPublicKey getPublicKey(byte[] fingerprint)
         {
             PGPPublicKey k = (PGPPublicKey)extraPubKeys.get(i);
 
-            if (Arrays.areEqual(fingerprint, k.getFingerprint()))
+            if (k.hasFingerprint(fingerprint))
             {
                 return k;
             }
@@ -356,7 +355,7 @@ public PGPSecretKey getSecretKey(byte[] fingerprint)
         {
             PGPSecretKey k = (PGPSecretKey)keys.get(i);
 
-            if (Arrays.areEqual(fingerprint, k.getPublicKey().getFingerprint()))
+            if (k.getPublicKey().hasFingerprint(fingerprint))
             {
                 return k;
             }
diff --git a/pg/src/main/jdk1.3/org/bouncycastle/openpgp/PGPPublicKeyRing.java b/pg/src/main/jdk1.3/org/bouncycastle/openpgp/PGPPublicKeyRing.java
@@ -23,7 +23,6 @@
 import org.bouncycastle.bcpg.TrustPacket;
 import org.bouncycastle.bcpg.UserDataPacket;
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
-import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.Iterable;
 import org.bouncycastle.util.Longs;
 
@@ -184,7 +183,7 @@ public PGPPublicKey getPublicKey(byte[] fingerprint)
         {
             PGPPublicKey k = (PGPPublicKey)keys.get(i);
 
-            if (Arrays.areEqual(fingerprint, k.getFingerprint()))
+            if (k.hasFingerprint(fingerprint))
             {
                 return k;
             }
@@ -468,7 +467,7 @@ public static PGPPublicKeyRing join(
         boolean allowSubkeySigsOnNonSubkey)
         throws PGPException
     {
-        if (!Arrays.areEqual(first.getPublicKey().getFingerprint(), second.getPublicKey().getFingerprint()))
+        if (!second.getPublicKey().hasFingerprint(first.getPublicKey().getFingerprint()))
         {
             throw new IllegalArgumentException("Cannot merge certificates with differing primary keys.");
         }
diff --git a/pg/src/main/jdk1.3/org/bouncycastle/openpgp/PGPSecretKeyRing.java b/pg/src/main/jdk1.3/org/bouncycastle/openpgp/PGPSecretKeyRing.java
@@ -24,7 +24,6 @@
 import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;
 import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
 import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor;
-import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.Iterable;
 
 /**
@@ -246,7 +245,7 @@ public PGPPublicKey getPublicKey(byte[] fingerprint)
         {
             PGPPublicKey k = (PGPPublicKey)extraPubKeys.get(i);
 
-            if (Arrays.areEqual(fingerprint, k.getFingerprint()))
+            if (k.hasFingerprint(fingerprint))
             {
                 return k;
             }
@@ -356,7 +355,7 @@ public PGPSecretKey getSecretKey(byte[] fingerprint)
         {
             PGPSecretKey k = (PGPSecretKey)keys.get(i);
 
-            if (Arrays.areEqual(fingerprint, k.getPublicKey().getFingerprint()))
+            if (k.getPublicKey().hasFingerprint(fingerprint))
             {
                 return k;
             }
diff --git a/pg/src/test/j2me/org/bouncycastle/openpgp/test/BcPGPRSATest.java b/pg/src/test/j2me/org/bouncycastle/openpgp/test/BcPGPRSATest.java
@@ -406,7 +406,12 @@ private void fingerPrintTest()
 
         PGPPublicKey            pubKey = pgpPub.getPublicKey();
 
-        if (!areEqual(pubKey.getFingerprint(), Hex.decode("4FFB9F0884266C715D1CEAC804A3BBFA")))
+        byte[] expectedVersion3 = Hex.decode("4FFB9F0884266C715D1CEAC804A3BBFA");
+        if (!areEqual(pubKey.getFingerprint(), expectedVersion3))
+        {
+            fail("version 3 fingerprint test failed");
+        }
+        if (!pubKey.hasFingerprint(expectedVersion3))
         {
             fail("version 3 fingerprint test failed");
         }
@@ -418,7 +423,12 @@ private void fingerPrintTest()
 
         pubKey = pgpPub.getPublicKey();
 
-        if (!areEqual(pubKey.getFingerprint(), Hex.decode("3062363c1046a01a751946bb35586146fdf3f373")))
+        byte[] expectedVersion4 = Hex.decode("3062363c1046a01a751946bb35586146fdf3f373");
+        if (!areEqual(pubKey.getFingerprint(), expectedVersion4))
+        {
+            fail("version 4 fingerprint test failed");
+        }
+        if (!pubKey.hasFingerprint(expectedVersion4))
         {
             fail("version 4 fingerprint test failed");
         }
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPRSATest.java b/pg/src/test/java/org/bouncycastle/openpgp/test/BcPGPRSATest.java
@@ -405,7 +405,12 @@ private void fingerPrintTest()
 
         PGPPublicKey pubKey = pgpPub.getPublicKey();
 
-        if (!areEqual(pubKey.getFingerprint(), Hex.decode("4FFB9F0884266C715D1CEAC804A3BBFA")))
+        byte[] expectedVersion3 = Hex.decode("4FFB9F0884266C715D1CEAC804A3BBFA");
+        if (!areEqual(pubKey.getFingerprint(), expectedVersion3))
+        {
+            fail("version 3 fingerprint test failed");
+        }
+        if (!pubKey.hasFingerprint(expectedVersion3))
         {
             fail("version 3 fingerprint test failed");
         }
@@ -417,7 +422,12 @@ private void fingerPrintTest()
 
         pubKey = pgpPub.getPublicKey();
 
-        if (!areEqual(pubKey.getFingerprint(), Hex.decode("3062363c1046a01a751946bb35586146fdf3f373")))
+        byte[] expectedVersion4 = Hex.decode("3062363c1046a01a751946bb35586146fdf3f373");
+        if (!areEqual(pubKey.getFingerprint(), expectedVersion4))
+        {
+            fail("version 4 fingerprint test failed");
+        }
+        if (!pubKey.hasFingerprint(expectedVersion4))
         {
             fail("version 4 fingerprint test failed");
         }
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPClearSignedSignatureTest.java b/pg/src/test/java/org/bouncycastle/openpgp/test/PGPClearSignedSignatureTest.java
@@ -409,7 +409,8 @@ private void edDsaTest()
 
         PGPPublicKeyRing pubKeyRing = new PGPPublicKeyRing(aIn, new JcaKeyFingerprintCalculator());
 
-        isTrue(areEqual(Hex.decode("6234 6350 CAE2 433E 2400  1D72 94FA 62C3 6481 AE34"), pubKeyRing.getPublicKey().getFingerprint()));
+        isTrue(areEqual(pubKeyRing.getPublicKey().getFingerprint(), Hex.decode("6234 6350 CAE2 433E 2400  1D72 94FA 62C3 6481 AE34")));
+        isTrue(pubKeyRing.getPublicKey().hasFingerprint(Hex.decode("6234 6350 CAE2 433E 2400  1D72 94FA 62C3 6481 AE34")));
 
         aIn = new ArmoredInputStream(new ByteArrayInputStream(Strings.toByteArray(edDsaSignedMessage)));
 
@@ -473,7 +474,8 @@ private void edDsaBcTest()
 
         PGPPublicKeyRing pubKeyRing = new PGPPublicKeyRing(aIn, new BcKeyFingerprintCalculator());
 
-        isTrue(areEqual(Hex.decode("6234 6350 CAE2 433E 2400  1D72 94FA 62C3 6481 AE34"), pubKeyRing.getPublicKey().getFingerprint()));
+        isTrue(areEqual(pubKeyRing.getPublicKey().getFingerprint(), Hex.decode("6234 6350 CAE2 433E 2400  1D72 94FA 62C3 6481 AE34")));
+        isTrue(pubKeyRing.getPublicKey().hasFingerprint(Hex.decode("6234 6350 CAE2 433E 2400  1D72 94FA 62C3 6481 AE34")));
 
         aIn = new ArmoredInputStream(new ByteArrayInputStream(Strings.toByteArray(edDsaSignedMessage)));
 
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPEdDSATest.java b/pg/src/test/java/org/bouncycastle/openpgp/test/PGPEdDSATest.java
@@ -412,7 +412,8 @@ public void performTest()
 
         PGPPublicKeyRing pubKeyRing = new PGPPublicKeyRing(aIn, new JcaKeyFingerprintCalculator());
 
-        isTrue(areEqual(Hex.decode("EB85 BB5F A33A 75E1 5E94 4E63 F231 550C 4F47 E38E"), pubKeyRing.getPublicKey().getFingerprint()));
+        isTrue(areEqual(pubKeyRing.getPublicKey().getFingerprint(), Hex.decode("EB85 BB5F A33A 75E1 5E94 4E63 F231 550C 4F47 E38E")));
+        isTrue(pubKeyRing.getPublicKey().hasFingerprint(Hex.decode("EB85 BB5F A33A 75E1 5E94 4E63 F231 550C 4F47 E38E")));
 
         aIn = new ArmoredInputStream(new ByteArrayInputStream(Strings.toByteArray(edDSASecretKey)));
 
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPGeneralTest.java b/pg/src/test/java/org/bouncycastle/openpgp/test/PGPGeneralTest.java
@@ -1094,6 +1094,8 @@ public void testPGPPublicKey()
         PGPPublicKey publicKey7 = PGPPublicKey.join(publicKey2, publicKey2, true, true);
         isTrue(publicKey7.getKeyID() == publicKey2.getKeyID());
         isTrue(areEqual(publicKey7.getFingerprint(), publicKey2.getFingerprint()));
+        isTrue(publicKey7.hasFingerprint(publicKey2.getFingerprint()));
+        isTrue(publicKey2.hasFingerprint(publicKey7.getFingerprint()));
 
         PGPPublicKeyRingCollection pgpRingCollection = new JcaPGPPublicKeyRingCollection(probExpPubKey);
         final long id5 = 6556488621521814541L;
@@ -1105,6 +1107,8 @@ public void testPGPPublicKey()
         PGPPublicKey publicKey6 = PGPPublicKey.join(publicKey5, publicKey5, true, true);
         isTrue(publicKey6.getKeyID() == publicKey5.getKeyID());
         isTrue(areEqual(publicKey6.getFingerprint(), publicKey5.getFingerprint()));
+        isTrue(publicKey6.hasFingerprint(publicKey5.getFingerprint()));
+        isTrue(publicKey5.hasFingerprint(publicKey6.getFingerprint()));
     }
 
     private boolean messageIs(String message, String s)
@@ -2027,7 +2031,7 @@ public void testPGPSignatureSubpacketVector()
         PGPSignatureSubpacketVector hashedPcks = sig.getHashedSubPackets();
 
         IntendedRecipientFingerprint[] intFig = hashedPcks.getIntendedRecipientFingerprints();
-        isTrue("mismatch on intended rec. fingerprint", Arrays.areEqual(secretKey.getPublicKey().getFingerprint(), intFig[0].getFingerprint()));
+        isTrue("mismatch on intended rec. fingerprint", secretKey.getPublicKey().hasFingerprint(intFig[0].getFingerprint()));
 
         // Tests for null value
         isTrue("issuer key id should be 0", hashedPcks.getIssuerKeyID() == 0);
@@ -2080,7 +2084,7 @@ public void testPGPSignatureSubpacketVector()
         isTrue("Revocable should be false", !hashedPcks.isRevocable());
         isTrue("RevocationKeys should not be empty", hashedPcks.getRevocationKeys().length == 1);
         RevocationKey revocationKey = hashedPcks.getRevocationKeys()[0];
-        isTrue(areEqual(revocationKey.getFingerprint(), publicKey.getFingerprint()));
+        isTrue(publicKey.hasFingerprint(revocationKey.getFingerprint()));
         isTrue(revocationKey.getAlgorithm() == PublicKeyAlgorithmTags.DSA);
         // TODO: addRevocationKey has no parameter for setting signatureClass
         isTrue(revocationKey.getSignatureClass() == RevocationKeyTags.CLASS_DEFAULT);
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPRSATest.java b/pg/src/test/java/org/bouncycastle/openpgp/test/PGPRSATest.java
@@ -446,19 +446,29 @@ private void fingerPrintTest()
 
         PGPPublicKey            pubKey = pgpPub.getPublicKey();
 
-        if (!areEqual(pubKey.getFingerprint(), Hex.decode("4FFB9F0884266C715D1CEAC804A3BBFA")))
+        byte[] expectedVersion3 = Hex.decode("4FFB9F0884266C715D1CEAC804A3BBFA");
+        if (!areEqual(pubKey.getFingerprint(), expectedVersion3))
         {
             fail("version 3 fingerprint test failed");
         }
-        
+        if (!pubKey.hasFingerprint(expectedVersion3))
+        {
+            fail("version 3 fingerprint test failed");
+        }
+
         //
         // version 4
         //
         pgpPub = new PGPPublicKeyRing(testPubKey, new JcaKeyFingerprintCalculator());
 
         pubKey = pgpPub.getPublicKey();
 
-        if (!areEqual(pubKey.getFingerprint(), Hex.decode("3062363c1046a01a751946bb35586146fdf3f373")))
+        byte[] expectedVersion4 = Hex.decode("3062363c1046a01a751946bb35586146fdf3f373");
+        if (!areEqual(pubKey.getFingerprint(), expectedVersion4))
+        {
+            fail("version 4 fingerprint test failed");
+        }
+        if (!pubKey.hasFingerprint(expectedVersion4))
         {
             fail("version 4 fingerprint test failed");
         }
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPSignatureTest.java b/pg/src/test/java/org/bouncycastle/openpgp/test/PGPSignatureTest.java
@@ -657,11 +657,11 @@ public void performTest()
 
         IssuerFingerprint isFig = hashedPcks.getIssuerFingerprint();
 
-        isTrue("mismatch on issuer fingerprint", Arrays.areEqual(secretDSAKey.getPublicKey().getFingerprint(), isFig.getFingerprint()));
+        isTrue("mismatch on issuer fingerprint", secretDSAKey.getPublicKey().hasFingerprint(isFig.getFingerprint()));
 
         IntendedRecipientFingerprint intFig = hashedPcks.getIntendedRecipientFingerprint();
 
-        isTrue("mismatch on intended rec. fingerprint", Arrays.areEqual(secretKey.getPublicKey().getFingerprint(), intFig.getFingerprint()));
+        isTrue("mismatch on intended rec. fingerprint", secretKey.getPublicKey().hasFingerprint(intFig.getFingerprint()));
 
         prefAlgs = hashedPcks.getPreferredCompressionAlgorithms();
         preferredAlgorithmCheck("compression", NO_PREFERENCES, prefAlgs);
diff --git a/pg/src/test/java/org/bouncycastle/openpgp/test/PGPv6KeyTest.java b/pg/src/test/java/org/bouncycastle/openpgp/test/PGPv6KeyTest.java
@@ -68,9 +68,9 @@ public void performTest()
 
         Iterator<PGPPublicKey> pIt = publicKeys.getPublicKeys();
         PGPPublicKey key = (PGPPublicKey)pIt.next();
-        isTrue(Arrays.areEqual(PRIMARY_FINGERPRINT, key.getFingerprint()));
+        isTrue(key.hasFingerprint(PRIMARY_FINGERPRINT));
         key = (PGPPublicKey)pIt.next();
-        isTrue(Arrays.areEqual(SUBKEY_FINGERPRINT, key.getFingerprint()));
+        isTrue(key.hasFingerprint(SUBKEY_FINGERPRINT));
 
         bIn = new ByteArrayInputStream(ARMORED_KEY.getBytes());
         armorIn = new ArmoredInputStream(bIn);
diff --git a/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPEdDSATest.java b/pg/src/test/jdk1.1/org/bouncycastle/openpgp/test/PGPEdDSATest.java
@@ -414,7 +414,8 @@ public void performTest()
 
         PGPPublicKeyRing pubKeyRing = new PGPPublicKeyRing(aIn, new JcaKeyFingerprintCalculator());
 
-        isTrue(areEqual(Hex.decode("EB85 BB5F A33A 75E1 5E94 4E63 F231 550C 4F47 E38E"), pubKeyRing.getPublicKey().getFingerprint()));
+        isTrue(areEqual(pubKeyRing.getPublicKey().getFingerprint(), Hex.decode("EB85 BB5F A33A 75E1 5E94 4E63 F231 550C 4F47 E38E")));
+        isTrue(pubKeyRing.getPublicKey().hasFingerprint(Hex.decode("EB85 BB5F A33A 75E1 5E94 4E63 F231 550C 4F47 E38E")));
 
         aIn = new ArmoredInputStream(new ByteArrayInputStream(Strings.toByteArray(edDSASecretKey)));
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`	`import org.bouncycastle.bcpg.PublicKeyPacket;`
`16`	`16`	`import org.bouncycastle.bcpg.TrustPacket;`
`17`	`17`	`import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;`
`18`		`-import org.bouncycastle.util.Arrays;`
`19`	`18`
`20`	`19`	`/**`
`21`	`20`	`* Class to hold a single master public key and its subkeys.`
`@@ -135,7 +134,7 @@ public PGPPublicKey getPublicKey(byte[] fingerprint)`
`135`	`134`	`{`
`136`	`135`	`PGPPublicKey k = (PGPPublicKey)keys.get(i);`
`137`	`136`
`138`		`- if (Arrays.areEqual(fingerprint, k.getFingerprint()))`
	`137`	`+ if (k.hasFingerprint(fingerprint))`
`139`	`138`	`{`
`140`	`139`	`return k;`
`141`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`	`import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;`
`21`	`21`	`import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;`
`22`	`22`	`import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor;`
`23`		`-import org.bouncycastle.util.Arrays;`
`24`	`23`
`25`	`24`	`/**`
`26`	`25`	`* Class to hold a single master secret key and its subkeys.`
`@@ -185,7 +184,7 @@ public PGPPublicKey getPublicKey(byte[] fingerprint)`
`185`	`184`	`{`
`186`	`185`	`PGPPublicKey k = (PGPPublicKey)keys.get(i);`
`187`	`186`
`188`		`- if (Arrays.areEqual(fingerprint, k.getFingerprint()))`
	`187`	`+ if (k.hasFingerprint(fingerprint))`
`189`	`188`	`{`
`190`	`189`	`return k;`
`191`	`190`	`}`
`@@ -262,7 +261,7 @@ public PGPSecretKey getSecretKey(byte[] fingerprint)`
`262`	`261`	`{`
`263`	`262`	`PGPSecretKey k = (PGPSecretKey)keys.get(i);`
`264`	`263`
`265`		`- if (Arrays.areEqual(fingerprint, k.getPublicKey().getFingerprint()))`
	`264`	`+ if (k.getPublicKey().hasFingerprint(fingerprint))`
`266`	`265`	`{`
`267`	`266`	`return k;`
`268`	`267`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,6 @@`
`23`	`23`	`import org.bouncycastle.bcpg.TrustPacket;`
`24`	`24`	`import org.bouncycastle.bcpg.UserDataPacket;`
`25`	`25`	`import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;`
`26`		`-import org.bouncycastle.util.Arrays;`
`27`	`26`	`import org.bouncycastle.util.Iterable;`
`28`	`27`	`import org.bouncycastle.util.Longs;`
`29`	`28`
`@@ -184,7 +183,7 @@ public PGPPublicKey getPublicKey(byte[] fingerprint)`
`184`	`183`	`{`
`185`	`184`	`PGPPublicKey k = (PGPPublicKey)keys.get(i);`
`186`	`185`
`187`		`- if (Arrays.areEqual(fingerprint, k.getFingerprint()))`
	`186`	`+ if (k.hasFingerprint(fingerprint))`
`188`	`187`	`{`
`189`	`188`	`return k;`
`190`	`189`	`}`
`@@ -478,7 +477,7 @@ public static PGPPublicKeyRing join(`
`478`	`477`	`boolean allowSubkeySigsOnNonSubkey)`
`479`	`478`	`throws PGPException`
`480`	`479`	`{`
`481`		`- if (!Arrays.areEqual(first.getPublicKey().getFingerprint(), second.getPublicKey().getFingerprint()))`
	`480`	`+ if (!second.getPublicKey().hasFingerprint(first.getPublicKey().getFingerprint()))`
`482`	`481`	`{`
`483`	`482`	`throw new IllegalArgumentException("Cannot merge certificates with differing primary keys.");`
`484`	`483`	`}`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ public PGPPublicKey getPublicKey(`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`/**`
`281`		`- * Return the PGP public key associated with the given key fingerprint.`
	`281`	`+ * Return the public key ring which contains the key associated with the given key fingerprint.`
`282`	`282`	`*`
`283`	`283`	`* @param fingerprint the public key fingerprint to match against.`
`284`	`284`	`* @return the PGP public key ring containing the PGP public key matching fingerprint.`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`import org.bouncycastle.openpgp.operator.KeyFingerPrintCalculator;`
`25`	`25`	`import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;`
`26`	`26`	`import org.bouncycastle.openpgp.operator.PBESecretKeyEncryptor;`
`27`		`-import org.bouncycastle.util.Arrays;`
`28`	`27`	`import org.bouncycastle.util.Iterable;`
`29`	`28`
`30`	`29`	`/**`
`@@ -246,7 +245,7 @@ public PGPPublicKey getPublicKey(byte[] fingerprint)`
`246`	`245`	`{`
`247`	`246`	`PGPPublicKey k = (PGPPublicKey)extraPubKeys.get(i);`
`248`	`247`
`249`		`- if (Arrays.areEqual(fingerprint, k.getFingerprint()))`
	`248`	`+ if (k.hasFingerprint(fingerprint))`
`250`	`249`	`{`
`251`	`250`	`return k;`
`252`	`251`	`}`
`@@ -356,7 +355,7 @@ public PGPSecretKey getSecretKey(byte[] fingerprint)`
`356`	`355`	`{`
`357`	`356`	`PGPSecretKey k = (PGPSecretKey)keys.get(i);`
`358`	`357`
`359`		`- if (Arrays.areEqual(fingerprint, k.getPublicKey().getFingerprint()))`
	`358`	`+ if (k.getPublicKey().hasFingerprint(fingerprint))`
`360`	`359`	`{`
`361`	`360`	`return k;`
`362`	`361`	`}`
Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,12 @@ private void fingerPrintTest()`
`406`	`406`
`407`	`407`	`PGPPublicKey pubKey = pgpPub.getPublicKey();`
`408`	`408`
`409`		`- if (!areEqual(pubKey.getFingerprint(), Hex.decode("4FFB9F0884266C715D1CEAC804A3BBFA")))`
	`409`	`+ byte[] expectedVersion3 = Hex.decode("4FFB9F0884266C715D1CEAC804A3BBFA");`
	`410`	`+ if (!areEqual(pubKey.getFingerprint(), expectedVersion3))`
	`411`	`+ {`
	`412`	`+ fail("version 3 fingerprint test failed");`
	`413`	`+ }`
	`414`	`+ if (!pubKey.hasFingerprint(expectedVersion3))`
`410`	`415`	`{`
`411`	`416`	`fail("version 3 fingerprint test failed");`
`412`	`417`	`}`
`@@ -418,7 +423,12 @@ private void fingerPrintTest()`
`418`	`423`
`419`	`424`	`pubKey = pgpPub.getPublicKey();`
`420`	`425`
`421`		`- if (!areEqual(pubKey.getFingerprint(), Hex.decode("3062363c1046a01a751946bb35586146fdf3f373")))`
	`426`	`+ byte[] expectedVersion4 = Hex.decode("3062363c1046a01a751946bb35586146fdf3f373");`
	`427`	`+ if (!areEqual(pubKey.getFingerprint(), expectedVersion4))`
	`428`	`+ {`
	`429`	`+ fail("version 4 fingerprint test failed");`
	`430`	`+ }`
	`431`	`+ if (!pubKey.hasFingerprint(expectedVersion4))`
`422`	`432`	`{`
`423`	`433`	`fail("version 4 fingerprint test failed");`
`424`	`434`	`}`