KeyIdentifier: Allow parsing hex encoded Long Key-IDs

Author: vanitasvitae

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

@@ -32,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

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

@@ -39,6 +39,8 @@ public void performTest()
         testWildcardIdentifier();
         testIdentifierFromKeyId();
 
+        testIdentifierFromLongKeyId();
+
         testIdentifierFromV4Fingerprint();
         testIdentifierFromV6Fingerprint();
 
@@ -70,6 +72,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";