PKCS#12 fix

bcgit · Oct 12, 2015 · 4386e76 · 4386e76
1 parent e05009e
commit 4386e76
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/prov/src/main/jdk1.3/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java b/prov/src/main/jdk1.3/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java
@@ -517,7 +517,21 @@ protected void engineInit(
             {
                 throw new InvalidKeyException("Algorithm requires a PBE key");
             }
-            param = PBE.Util.makePBEParameters(k.getEncoded(), PKCS12, digest, keySizeInBits, ivLength * 8, pbeSpec, cipher.getAlgorithmName());
+            if (key instanceof BCPBEKey)
+            {
+                if (((BCPBEKey)key).getParam() != null)
+                {
+                    param = ((BCPBEKey)key).getParam();
+                }
+                else
+                {
+                    param = PBE.Util.makePBEParameters(k.getEncoded(), PKCS12, digest, keySizeInBits, ivLength * 8, pbeSpec, cipher.getAlgorithmName());
+                }
+            }
+            else
+            {
+                param = PBE.Util.makePBEParameters(k.getEncoded(), PKCS12, digest, keySizeInBits, ivLength * 8, pbeSpec, cipher.getAlgorithmName());
+            }
             if (param instanceof ParametersWithIV)
             {
                 ivParam = (ParametersWithIV)param;