Merge branch '1911-0-1-keyIdentifier' into 'main'

Update of KeyIdentifier class and test

See merge request root/bc-java!91

Author: dghgit

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

@@ -2,6 +2,7 @@
 
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.encoders.Hex;
@@ -31,6 +32,14 @@ public KeyIdentifier(String hexEncoded)
      */
     public KeyIdentifier(byte[] fingerprint)
     {
+        // Long KeyID
+        if (fingerprint.length == 8)
+        {
+            keyId = FingerprintUtil.longFromRightMostBytes(fingerprint);
+            this.fingerprint = null;
+            return;
+        }
+
         this.fingerprint = Arrays.clone(fingerprint);
 
         // v4
@@ -69,15 +78,24 @@ public KeyIdentifier(byte[] fingerprint, long keyId)
      */
     public KeyIdentifier(long keyId)
     {
-        this(null, keyId);
+        if (keyId == 0L)
+        {
+            this.keyId = 0L;
+            this.fingerprint = new byte[0];
+        }
+        else
+        {
+            this.keyId = keyId;
+            this.fingerprint = null;
+        }
     }
 
     /**
      * Create a wildcard {@link KeyIdentifier}.
      */
     private KeyIdentifier()
     {
-        this(new byte[0], 0L);
+        this(0L);
     }
 
     /**
@@ -123,7 +141,7 @@ public long getKeyId()
      */
     public boolean isWildcard()
     {
-        return keyId == 0L && fingerprint.length == 0;
+        return keyId == 0L && (fingerprint == null || fingerprint.length == 0);
     }
 
     /**
@@ -247,6 +265,19 @@ public String toString()
         }
 
         // -DM Hex.toHexString
-        return Hex.toHexString(fingerprint).toUpperCase();
+        return Hex.toHexString(fingerprint).toUpperCase(Locale.getDefault());
+    }
+
+    public String toPrettyPrint()
+    {
+        if (isWildcard())
+        {
+            return "*";
+        }
+        if (fingerprint == null)
+        {
+            return "0x" + Long.toHexString(keyId).toUpperCase(Locale.getDefault());
+        }
+        return FingerprintUtil.prettifyFingerprint(fingerprint);
     }
 }

pg/src/test/java/org/bouncycastle/openpgp/test/KeyIdentifierTest.java

@@ -39,6 +39,8 @@ public void performTest()
         testWildcardIdentifier();
         testIdentifierFromKeyId();
 
+        testIdentifierFromLongKeyId();
+
         testIdentifierFromV4Fingerprint();
         testIdentifierFromV6Fingerprint();
 
@@ -57,6 +59,9 @@ private void testWildcardIdentifier()
                 wildcard.isWildcard());
 
         isEquals("*", wildcard.toString());
+
+        KeyIdentifier id = new KeyIdentifier(0L);
+        isTrue(id.isWildcard());
     }
 
     private void testIdentifierFromKeyId()
@@ -70,6 +75,17 @@ private void testIdentifierFromKeyId()
         isEquals("1234", identifier.toString());
     }
 
+    private void testIdentifierFromLongKeyId()
+    {
+        isEquals(5145070902336167606L, new KeyIdentifier("4766F6B9D5F21EB6").getKeyId());
+        isEquals(5145070902336167606L, new KeyIdentifier("4766f6b9d5f21eb6").getKeyId());
+
+        isEquals(5507497285755629956L, new KeyIdentifier("4C6E8F99F6E47184").getKeyId());
+        isEquals(1745434690267590572L, new KeyIdentifier("1839079A640B2FAC").getKeyId());
+
+        isTrue(new KeyIdentifier("1839079A640B2FAC").getFingerprint() == null);
+    }
+
     private void testIdentifierFromV4Fingerprint()
     {
         String hexFingerprint = "D1A66E1A23B182C9980F788CFBFCC82A015E7330";