Merge branch '1985-pbe-generator' into 'main'

1985 pbe generator

See merge request root/bc-java!70

Author: dghgit

pkix/src/test/java/org/bouncycastle/cms/test/GOSTR3410_2012_256CmsSignVerifyDetached.java

@@ -128,7 +128,7 @@ private static boolean verifyDetached(byte[] data, byte[] detachedCms,
                     PKIXBuilderParameters params = new PKIXBuilderParameters(trustAnchors, constraints);
 
                     params.setDate(new Date(x509Certificate.getNotAfter().getTime() - 5000L));
-                    
+
                     JcaCertStoreBuilder certStoreBuilder = new JcaCertStoreBuilder();
                     certStoreBuilder.addCertificate(signerCert);
 

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

@@ -448,7 +448,7 @@ else if (modeName.startsWith("PGPCFB"))
             {
                 throw new NoSuchAlgorithmException("no mode support for " + modeName);
             }
-            
+
             ivLength = baseEngine.getBlockSize();
             cipher = new BufferedGenericBlockCipher(
                 new PGPCFBBlockCipher(baseEngine, inlineIV));
@@ -821,14 +821,16 @@ else if (!(key instanceof RepeatedSecretKeySpec))
             param = null;
         }
 
-        AlgorithmParameterSpec params;
+        AlgorithmParameterSpec params = paramSpec;
         if (paramSpec instanceof PBEParameterSpec)
         {
             params = ((PBEParameterSpec)paramSpec).getParameterSpec();
-        }
-        else
-        {
-            params = paramSpec;
+            // 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)

prov/src/test/java/org/bouncycastle/jce/provider/test/PBETest.java

@@ -564,6 +564,43 @@ private void testExtendedPBEParameterSpec()
 
         isTrue(Arrays.areEqual(input, decryptedBytes));
     }
+
+    private void testNoIvPBEParameterSpec()
+        throws Exception
+    {
+        String cipherAlgo = "PBEWITHSHA256AND256BITAES-CBC-BC";
+
+        SecureRandom random = new FixedSecureRandom(Hex.decode(
+            "000102030405060708090a0b0c0d0e0f"
+                + "a0a1a2a3a4a5a6a7a8a9aaabacadaeaf"));
+
+        char[] password = "abcdefghijklmnop".toCharArray();
+        PBEKeySpec pbeKeySpec = new PBEKeySpec(password);
+
+        SecretKeyFactory factory = SecretKeyFactory.getInstance(
+            "PBEWITHSHA256AND256BITAES-CBC-BC",
+            "BC");
+        SecretKey key = factory.generateSecret(pbeKeySpec);
+
+        byte[] salt = new byte[16];
+        random.nextBytes(salt);
+        // simulate the situation for issue #1985
+        byte[] iv = new byte[0];
+
+        PBEParameterSpec pbeParamSpec = new PBEParameterSpec(salt, 1000, new IvParameterSpec(iv));
+
+        Cipher encryptCipher = Cipher.getInstance(cipherAlgo, "BC");
+        Cipher decryptCipher = Cipher.getInstance(cipherAlgo, "BC");
+
+        encryptCipher.init(Cipher.ENCRYPT_MODE, key, pbeParamSpec);
+        decryptCipher.init(Cipher.DECRYPT_MODE, key, pbeParamSpec);
+
+        byte[] input = Strings.toByteArray("testing");
+        byte[] encryptedBytes = encryptCipher.doFinal(input);
+        byte[] decryptedBytes = decryptCipher.doFinal(encryptedBytes);
+
+        isTrue(Arrays.areEqual(input, decryptedBytes));
+    }
 
     public void performTest()
         throws Exception
@@ -710,7 +747,7 @@ public void performTest()
         }
 
         testExtendedPBEParameterSpec();
-
+        testNoIvPBEParameterSpec();
         testPKCS12Interop();
 
         testPBEHMac("PBEWithHMacSHA1", hMac1);