Refactor on OnePassSignaturePacket and add tests back to OperatorBcTest

Author: gefeili

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

@@ -1,6 +1,7 @@
 package org.bouncycastle.bcpg;
 
 import org.bouncycastle.util.Arrays;
+import org.bouncycastle.util.Pack;
 import org.bouncycastle.util.io.Streams;
 
 import java.io.ByteArrayOutputStream;
@@ -74,15 +75,7 @@ else if (version == VERSION_6)
             fingerprint = new byte[32];
             in.readFully(fingerprint);
 
-            // TODO: Replace with FingerprintUtil
-            keyID = ((fingerprint[0] & 0xffL) << 56) |
-                    ((fingerprint[1] & 0xffL) << 48) |
-                    ((fingerprint[2] & 0xffL) << 40) |
-                    ((fingerprint[3] & 0xffL) << 32) |
-                    ((fingerprint[4] & 0xffL) << 24) |
-                    ((fingerprint[5] & 0xffL) << 16) |
-                    ((fingerprint[6] & 0xffL) << 8) |
-                    ((fingerprint[7] & 0xffL));
+            keyID = Pack.bigEndianToLong(fingerprint, 0);
         }
         else
         {
@@ -154,15 +147,7 @@ public OnePassSignaturePacket(
         this.salt = salt;
         this.fingerprint = fingerprint;
         this.isContaining = (isNested) ? 0 : 1;
-        // TODO: Replace with FingerprintUtil
-        keyID = ((fingerprint[0] & 0xffL) << 56) |
-                ((fingerprint[1] & 0xffL) << 48) |
-                ((fingerprint[2] & 0xffL) << 40) |
-                ((fingerprint[3] & 0xffL) << 32) |
-                ((fingerprint[4] & 0xffL) << 24) |
-                ((fingerprint[5] & 0xffL) << 16) |
-                ((fingerprint[6] & 0xffL) << 8) |
-                ((fingerprint[7] & 0xffL));
+        this.keyID = Pack.bigEndianToLong(fingerprint, 0);
     }
 
     /**

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

@@ -50,10 +50,12 @@
 import org.bouncycastle.openpgp.PGPSignature;
 import org.bouncycastle.openpgp.bc.BcPGPObjectFactory;
 import org.bouncycastle.openpgp.jcajce.JcaPGPObjectFactory;
+import org.bouncycastle.openpgp.operator.PBESecretKeyDecryptor;
 import org.bouncycastle.openpgp.operator.PGPContentVerifier;
 import org.bouncycastle.openpgp.operator.PGPDigestCalculator;
 import org.bouncycastle.openpgp.operator.PGPDigestCalculatorProvider;
 import org.bouncycastle.openpgp.operator.bc.BcKeyFingerprintCalculator;
+import org.bouncycastle.openpgp.operator.bc.BcPBESecretKeyDecryptorBuilder;
 import org.bouncycastle.openpgp.operator.bc.BcPGPContentVerifierBuilderProvider;
 import org.bouncycastle.openpgp.operator.bc.BcPGPDataEncryptorBuilder;
 import org.bouncycastle.openpgp.operator.bc.BcPGPDigestCalculatorProvider;
@@ -101,9 +103,9 @@ public void performTest()
         testX25519HKDF();
         testKeyRings();
         testBcPGPKeyPair();
-//        testBcPGPDataEncryptorBuilder();
+        testBcPGPDataEncryptorBuilder();
         testBcPGPContentVerifierBuilderProvider();
-        //testBcPBESecretKeyDecryptorBuilder();
+        testBcPBESecretKeyDecryptorBuilder();
         testBcKeyFingerprintCalculator();
         testBcStandardDigests();
     }
@@ -179,12 +181,12 @@ public void operation()
         });
     }
 
-//    public void testBcPBESecretKeyDecryptorBuilder()
-//        throws PGPException
-//    {
-//        final PBESecretKeyDecryptor decryptor = new BcPBESecretKeyDecryptorBuilder(new BcPGPDigestCalculatorProvider()).build(BcPGPDSAElGamalTest.pass);
-//        decryptor.recoverKeyData(SymmetricKeyAlgorithmTags.CAMELLIA_256, new byte[32], new byte[12], new byte[16], 0, 16);
-//    }
+    public void testBcPBESecretKeyDecryptorBuilder()
+        throws PGPException
+    {
+        final PBESecretKeyDecryptor decryptor = new BcPBESecretKeyDecryptorBuilder(new BcPGPDigestCalculatorProvider()).build(BcPGPDSAElGamalTest.pass);
+        decryptor.recoverKeyData(SymmetricKeyAlgorithmTags.CAMELLIA_256, new byte[32], new byte[12], new byte[16], 0, 16);
+    }
 
     public void testBcPGPContentVerifierBuilderProvider()
         throws Exception