Merge branch '1911-4-keyidentifier-test' into 'main'

Update KeyIdentifier and related classes, update FingerprintUtil, remove OpenPGPV6KeyGenerator

See merge request root/bc-java!106

Author: dghgit

pg/src/main/java/org/bouncycastle/bcpg/FingerprintUtil.java

@@ -3,6 +3,8 @@
 import org.bouncycastle.util.Pack;
 import org.bouncycastle.util.encoders.Hex;
 
+import java.util.Locale;
+
 public class FingerprintUtil
 {
 
@@ -141,7 +143,7 @@ public static void writeKeyID(long keyID, byte[] bytes)
     public static String prettifyFingerprint(byte[] fingerprint)
     {
         // -DM Hex.toHexString
-        char[] hex = Hex.toHexString(fingerprint).toUpperCase().toCharArray();
+        char[] hex = Hex.toHexString(fingerprint).toUpperCase(Locale.getDefault()).toCharArray();
         StringBuilder sb = new StringBuilder();
         switch (hex.length)
         {

pg/src/main/java/org/bouncycastle/bcpg/KeyIdentifier.java

@@ -170,6 +170,11 @@ public boolean matches(KeyIdentifier other)
             return true;
         }
 
+        return matchesExplicit(other);
+    }
+
+    public boolean matchesExplicit(KeyIdentifier other)
+    {
         if (fingerprint != null && other.fingerprint != null)
         {
             return Arrays.constantTimeAreEqual(fingerprint, other.fingerprint);
@@ -214,7 +219,7 @@ public boolean isPresentIn(List<KeyIdentifier> others)
     {
         for (Iterator it = others.iterator(); it.hasNext();)
         {
-            if (this.matches((KeyIdentifier)it.next()))
+            if (this.matchesExplicit((KeyIdentifier)it.next()))
             {
                 return true;
             }

pg/src/main/java/org/bouncycastle/openpgp/PGPPublicKeyRing.java

@@ -201,7 +201,7 @@ public PGPPublicKey getPublicKey(KeyIdentifier identifier)
         for (Iterator it = keys.iterator(); it.hasNext();)
         {
             PGPPublicKey k = (PGPPublicKey)it.next();
-            if (identifier.matches(k.getKeyIdentifier()))
+            if (identifier.matchesExplicit(k.getKeyIdentifier()))
             {
                 return k;
             }
@@ -216,7 +216,7 @@ public Iterator<PGPPublicKey> getPublicKeys(KeyIdentifier identifier)
         for (Iterator it = keys.iterator(); it.hasNext();)
         {
             PGPPublicKey k = (PGPPublicKey)it.next();
-            if (identifier.matches(k.getKeyIdentifier()))
+            if (identifier.matchesExplicit(k.getKeyIdentifier()))
             {
                 matches.add(k);
             }

pg/src/main/java/org/bouncycastle/openpgp/PGPSecretKeyRing.java

@@ -263,7 +263,7 @@ public PGPPublicKey getPublicKey(KeyIdentifier identifier)
         for (Iterator it = keys.iterator(); it.hasNext();)
         {
             PGPSecretKey k = (PGPSecretKey)it.next();
-            if (k.getPublicKey() != null && identifier.matches(k.getKeyIdentifier()))
+            if (k.getPublicKey() != null && identifier.matchesExplicit(k.getKeyIdentifier()))
             {
                 return k.getPublicKey();
             }
@@ -272,7 +272,7 @@ public PGPPublicKey getPublicKey(KeyIdentifier identifier)
         for (Iterator it = extraPubKeys.iterator(); it.hasNext();)
         {
             PGPPublicKey k = (PGPPublicKey)it.next();
-            if (identifier.matches(k.getKeyIdentifier()))
+            if (identifier.matchesExplicit(k.getKeyIdentifier()))
             {
                 return k;
             }
@@ -287,7 +287,7 @@ public Iterator<PGPPublicKey> getPublicKeys(KeyIdentifier identifier)
         for (Iterator it = keys.iterator(); it.hasNext();)
         {
             PGPSecretKey k = (PGPSecretKey)it.next();
-            if (k.getPublicKey() != null && identifier.matches(k.getKeyIdentifier()))
+            if (k.getPublicKey() != null && identifier.matchesExplicit(k.getKeyIdentifier()))
             {
                 matches.add(k.getPublicKey());
             }
@@ -296,7 +296,7 @@ public Iterator<PGPPublicKey> getPublicKeys(KeyIdentifier identifier)
         for (Iterator it = extraPubKeys.iterator(); it.hasNext();)
         {
             PGPPublicKey k = (PGPPublicKey)it.next();
-            if (identifier.matches(k.getKeyIdentifier()))
+            if (identifier.matchesExplicit(k.getKeyIdentifier()))
             {
                 matches.add(k);
             }
@@ -309,7 +309,7 @@ public PGPSecretKey getSecretKey(KeyIdentifier identifier)
         for (Iterator it = keys.iterator(); it.hasNext();)
         {
             PGPSecretKey k = (PGPSecretKey)it.next();
-            if (identifier.matches(k.getKeyIdentifier()))
+            if (identifier.matchesExplicit(k.getKeyIdentifier()))
             {
                 return k;
             }
@@ -323,7 +323,7 @@ public Iterator<PGPSecretKey> getSecretKeys(KeyIdentifier identifier)
         for (Iterator it = keys.iterator(); it.hasNext();)
         {
             PGPSecretKey k = (PGPSecretKey)it.next();
-            if (identifier.matches(k.getKeyIdentifier()))
+            if (identifier.matchesExplicit(k.getKeyIdentifier()))
             {
                 matches.add(k);
             }

pg/src/main/java/org/bouncycastle/openpgp/PGPSignature.java

@@ -654,7 +654,7 @@ public boolean hasKeyIdentifier(KeyIdentifier identifier)
     {
         for (Iterator it = getKeyIdentifiers().iterator(); it.hasNext(); )
         {
-            if (((KeyIdentifier)it.next()).matches(identifier))
+            if (((KeyIdentifier)it.next()).matchesExplicit(identifier))
             {
                 return true;
             }

pg/src/main/java/org/bouncycastle/openpgp/api/OpenPGPCertificate.java

@@ -303,7 +303,7 @@ public boolean test(OpenPGPComponentKey key, Date time)
      */
     public OpenPGPComponentKey getKey(KeyIdentifier identifier)
     {
-        if (identifier.matches(getPrimaryKey().getPGPPublicKey().getKeyIdentifier()))
+        if (identifier.matchesExplicit(getPrimaryKey().getPGPPublicKey().getKeyIdentifier()))
         {
             return primaryKey;
         }
@@ -636,7 +636,6 @@ public String toAsciiArmoredString()
     public String toAsciiArmoredString(PacketFormat packetFormat)
         throws IOException
     {
-        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
         ArmoredOutputStream.Builder armorBuilder = ArmoredOutputStream.builder()
             .clearHeaders();
         // Add fingerprint comment
@@ -648,7 +647,24 @@ public String toAsciiArmoredString(PacketFormat packetFormat)
             armorBuilder.addEllipsizedComment(it.next().getUserId());
         }
 
+        return toAsciiArmoredString(packetFormat, armorBuilder);
+    }
+
+    /**
+     * Return an ASCII armored {@link String} containing the certificate.
+     * The {@link ArmoredOutputStream.Builder} can be used to customize the ASCII armor (headers, CRC etc.).
+     *
+     * @param packetFormat packet length encoding format
+     * @param armorBuilder builder for the ASCII armored output stream
+     * @return armored certificate
+     * @throws IOException if the cert cannot be encoded
+     */
+    public String toAsciiArmoredString(PacketFormat packetFormat, ArmoredOutputStream.Builder armorBuilder)
+        throws IOException
+    {
+        ByteArrayOutputStream bOut = new ByteArrayOutputStream();
         ArmoredOutputStream aOut = armorBuilder.build(bOut);
+
         aOut.write(getEncoded(packetFormat));
         aOut.close();
         return bOut.toString();