Expose version, fingerprint and salt in PGPOnePassSignature

Author: vanitasvitae

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

@@ -1,5 +1,6 @@
 package org.bouncycastle.bcpg;
 
+import org.bouncycastle.util.Arrays;
 import org.bouncycastle.util.io.Streams;
 
 import java.io.ByteArrayOutputStream;
@@ -213,7 +214,7 @@ public long getKeyID()
      * @return 32 bytes issuer fingerprint
      */
     public byte[] getFingerprint() {
-        return fingerprint;
+        return Arrays.clone(fingerprint);
     }
 
     /**
@@ -222,7 +223,7 @@ public byte[] getFingerprint() {
      * @return salt
      */
     public byte[] getSalt() {
-        return salt;
+        return Arrays.clone(salt);
     }
 
     /**

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

@@ -88,11 +88,44 @@ public boolean verify(
         return verifier.verify(pgpSig.getSignature());
     }
 
+    /**
+     * Return the packet version.
+     *
+     * @return packet version
+     */
+    public int getVersion() {
+        return sigPack.getVersion();
+    }
+
+    /**
+     * Return the key-ID of the issuer signing key.
+     * For {@link OnePassSignaturePacket#VERSION_6} packets, the key-ID is derived from the fingerprint.
+     *
+     * @return key-ID
+     */
     public long getKeyID()
     {
         return sigPack.getKeyID();
     }
 
+    /**
+     * Return the issuer key fingerprint.
+     * Only for {@link OnePassSignaturePacket#VERSION_6} packets.
+     * @return fingerprint
+     */
+    public byte[] getFingerprint() {
+        return sigPack.getFingerprint();
+    }
+
+    /**
+     * Return the salt used in the corresponding signature.
+     * Only for {@link OnePassSignaturePacket#VERSION_6} packets.
+     * @return salt
+     */
+    public byte[] getSalt() {
+        return sigPack.getSalt();
+    }
+
     public int getSignatureType()
     {
         return sigPack.getSignatureType();