Merge branch 'pgpainless-moreKeyIdentifiers'

Author: dghgit

pg/src/main/java/org/bouncycastle/bcpg/sig/IntendedRecipientFingerprint.java

@@ -2,6 +2,7 @@
 
 import org.bouncycastle.bcpg.SignatureSubpacket;
 import org.bouncycastle.bcpg.SignatureSubpacketTags;
+import org.bouncycastle.openpgp.KeyIdentifier;
 import org.bouncycastle.util.Arrays;
 
 /**
@@ -40,4 +41,9 @@ public byte[] getFingerprint()
     {
         return Arrays.copyOfRange(data, 1, data.length);
     }
+
+    public KeyIdentifier getKeyIdentifier()
+    {
+        return new KeyIdentifier(getFingerprint());
+    }
 }

pg/src/main/java/org/bouncycastle/bcpg/sig/IssuerFingerprint.java

@@ -4,6 +4,7 @@
 import org.bouncycastle.bcpg.PublicKeyPacket;
 import org.bouncycastle.bcpg.SignatureSubpacket;
 import org.bouncycastle.bcpg.SignatureSubpacketTags;
+import org.bouncycastle.openpgp.KeyIdentifier;
 import org.bouncycastle.util.Arrays;
 
 /**
@@ -59,4 +60,9 @@ public long getKeyID()
         }
         return 0;
     }
+
+    public KeyIdentifier getKeyIdentifier()
+    {
+        return new KeyIdentifier(getFingerprint());
+    }
 }

pg/src/main/java/org/bouncycastle/bcpg/sig/IssuerKeyID.java

@@ -3,6 +3,7 @@
 import org.bouncycastle.bcpg.FingerprintUtil;
 import org.bouncycastle.bcpg.SignatureSubpacket;
 import org.bouncycastle.bcpg.SignatureSubpacketTags;
+import org.bouncycastle.openpgp.KeyIdentifier;
 
 /**
  * Signature Subpacket containing the key-id of the issuers signing (sub-) key.
@@ -44,4 +45,9 @@ public long getKeyID()
     {
         return FingerprintUtil.readKeyID(data);
     }
+
+    public KeyIdentifier getKeyIdentifier()
+    {
+        return new KeyIdentifier(getKeyID());
+    }
 }

pg/src/main/java/org/bouncycastle/bcpg/sig/RevocationKey.java

@@ -2,6 +2,7 @@
 
 import org.bouncycastle.bcpg.SignatureSubpacket;
 import org.bouncycastle.bcpg.SignatureSubpacketTags;
+import org.bouncycastle.openpgp.KeyIdentifier;
 
 /**
  * Represents revocation key OpenPGP signature sub packet.
@@ -55,4 +56,9 @@ public byte[] getFingerprint()
         System.arraycopy(data, 2, fingerprint, 0, fingerprint.length);
         return fingerprint;
     }
+
+    public KeyIdentifier getKeyIdentifier()
+    {
+        return new KeyIdentifier(getFingerprint());
+    }
 }