Fix NPE when calling isWildcard() on a KeyIdentifer created from 0L keyId

Author: vanitasvitae

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

@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Locale;
 
+import org.bouncycastle.internal.asn1.gnu.GNUObjectIdentifiers;
 import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.encoders.Hex;
 
@@ -78,15 +79,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);
     }
 
     /**

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

@@ -59,6 +59,9 @@ private void testWildcardIdentifier()
                 wildcard.isWildcard());
 
         isEquals("*", wildcard.toString());
+
+        KeyIdentifier id = new KeyIdentifier(0L);
+        isTrue(id.isWildcard());
     }
 
     private void testIdentifierFromKeyId()