Fix the issue and add test for #1985

Author: gefeili

prov/src/main/java/org/bouncycastle/jcajce/provider/symmetric/util/BaseBlockCipher.java

@@ -634,11 +634,11 @@ else if (paddingName.equals("TBCPADDING"))
     protected void engineInit(
         int opmode,
         Key key,
-        AlgorithmParameterSpec params,
+        final AlgorithmParameterSpec paramSpec,
         SecureRandom random)
         throws InvalidKeyException, InvalidAlgorithmParameterException
     {
-        CipherParameters param = null;
+        CipherParameters param;
 
         this.pbeSpec = null;
         this.pbeAlgorithm = null;
@@ -656,7 +656,7 @@ protected void engineInit(
         //
         // for RC5-64 we must have some default parameters
         //
-        if (params == null && (baseEngine != null && baseEngine.getAlgorithmName().startsWith("RC5-64")))
+        if (paramSpec == null && (baseEngine != null && baseEngine.getAlgorithmName().startsWith("RC5-64")))
         {
             throw new InvalidAlgorithmParameterException("RC5 requires an RC5ParametersSpec to be passed in.");
         }
@@ -676,9 +676,9 @@ protected void engineInit(
                 throw new InvalidKeyException("PKCS12 requires a SecretKey/PBEKey");
             }
 
-            if (params instanceof PBEParameterSpec)
+            if (paramSpec instanceof PBEParameterSpec)
             {
-                pbeSpec = (PBEParameterSpec)params;
+                pbeSpec = (PBEParameterSpec)paramSpec;
             }
 
             if (k instanceof PBEKey && pbeSpec == null)
@@ -727,9 +727,9 @@ else if (key instanceof PBKDF1Key)
         {
             PBKDF1Key k = (PBKDF1Key)key;
 
-            if (params instanceof PBEParameterSpec)
+            if (paramSpec instanceof PBEParameterSpec)
             {
-                pbeSpec = (PBEParameterSpec)params;
+                pbeSpec = (PBEParameterSpec)paramSpec;
             }
             if (k instanceof PBKDF1KeyWithParameters && pbeSpec == null)
             {
@@ -746,9 +746,9 @@ else if (key instanceof PBKDF2Key)
         {
             PBKDF2Key k = (PBKDF2Key)key;
 
-            if (param instanceof PBEParameterSpec)
+            if (paramSpec instanceof PBEParameterSpec)
             {
-                pbeSpec = (PBEParameterSpec)param;
+                pbeSpec = (PBEParameterSpec)paramSpec;
             }
             if (k instanceof PBKDF2KeyWithParameters && pbeSpec == null)
             {
@@ -776,12 +776,12 @@ else if (key instanceof BCPBEKey)
 
             if (k.getParam() != null)
             {
-                param = adjustParameters(params, k.getParam());
+                param = adjustParameters(paramSpec, k.getParam());
             }
-            else if (params instanceof PBEParameterSpec)
+            else if (paramSpec instanceof PBEParameterSpec)
             {
-                pbeSpec = (PBEParameterSpec)params;
-                param = PBE.Util.makePBEParameters(k, params, cipher.getUnderlyingCipher().getAlgorithmName());
+                pbeSpec = (PBEParameterSpec)paramSpec;
+                param = PBE.Util.makePBEParameters(k, paramSpec, cipher.getUnderlyingCipher().getAlgorithmName());
             }
             else
             {
@@ -796,7 +796,7 @@ else if (params instanceof PBEParameterSpec)
         else if (key instanceof PBEKey)
         {
             PBEKey k = (PBEKey)key;
-            pbeSpec = (PBEParameterSpec)params;
+            pbeSpec = (PBEParameterSpec)paramSpec;
             if (k instanceof PKCS12KeyWithParameters && pbeSpec == null)
             {
                 pbeSpec = new PBEParameterSpec(k.getSalt(), k.getIterationCount());
@@ -821,19 +821,17 @@ else if (!(key instanceof RepeatedSecretKeySpec))
             param = null;
         }
 
-//        AlgorithmParameterSpec params;
-//        if (params instanceof PBEParameterSpec)
-//        {
-//            params = ((PBEParameterSpec)params).getParameterSpec();
-//            if (((IvParameterSpec)params).getIV().length == 0)
-//            {
-//                params = new IvParameterSpec(((ParametersWithIV)param).getIV());
-//            }
-//        }
-//        else
-//        {
-//            params = params;
-//        }
+        AlgorithmParameterSpec params = paramSpec;
+        if (paramSpec instanceof PBEParameterSpec)
+        {
+            params = ((PBEParameterSpec)paramSpec).getParameterSpec();
+            // If params.getIv() returns an empty byte array, ivParam will be assigned an IV generated by PBE.Util.makePBEParameters
+            // according to RFC 7292. This behavior is intended for Jasypt users who choose to use NoIvGenerator.
+            if (params instanceof IvParameterSpec && ((IvParameterSpec)params).getIV().length == 0)
+            {
+                params = paramSpec;
+            }
+        }
 
         if (params instanceof AEADParameterSpec)
         {