Test the code of Jasypt

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,
-        final AlgorithmParameterSpec paramSpec,
+         AlgorithmParameterSpec params,
         SecureRandom random)
         throws InvalidKeyException, InvalidAlgorithmParameterException
     {
-        CipherParameters param;
+        CipherParameters param = null;
 
         this.pbeSpec = null;
         this.pbeAlgorithm = null;
@@ -656,7 +656,7 @@ protected void engineInit(
         //
         // for RC5-64 we must have some default parameters
         //
-        if (paramSpec == null && (baseEngine != null && baseEngine.getAlgorithmName().startsWith("RC5-64")))
+        if (params == 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 (paramSpec instanceof PBEParameterSpec)
+            if (params instanceof PBEParameterSpec)
             {
-                pbeSpec = (PBEParameterSpec)paramSpec;
+                pbeSpec = (PBEParameterSpec)params;
             }
 
             if (k instanceof PBEKey && pbeSpec == null)
@@ -727,9 +727,9 @@ else if (key instanceof PBKDF1Key)
         {
             PBKDF1Key k = (PBKDF1Key)key;
 
-            if (paramSpec instanceof PBEParameterSpec)
+            if (params instanceof PBEParameterSpec)
             {
-                pbeSpec = (PBEParameterSpec)paramSpec;
+                pbeSpec = (PBEParameterSpec)params;
             }
             if (k instanceof PBKDF1KeyWithParameters && pbeSpec == null)
             {
@@ -746,9 +746,9 @@ else if (key instanceof PBKDF2Key)
         {
             PBKDF2Key k = (PBKDF2Key)key;
 
-            if (paramSpec instanceof PBEParameterSpec)
+            if (param instanceof PBEParameterSpec)
             {
-                pbeSpec = (PBEParameterSpec)paramSpec;
+                pbeSpec = (PBEParameterSpec)param;
             }
             if (k instanceof PBKDF2KeyWithParameters && pbeSpec == null)
             {
@@ -776,12 +776,12 @@ else if (key instanceof BCPBEKey)
 
             if (k.getParam() != null)
             {
-                param = adjustParameters(paramSpec, k.getParam());
+                param = adjustParameters(params, k.getParam());
             }
-            else if (paramSpec instanceof PBEParameterSpec)
+            else if (params instanceof PBEParameterSpec)
             {
-                pbeSpec = (PBEParameterSpec)paramSpec;
-                param = PBE.Util.makePBEParameters(k, paramSpec, cipher.getUnderlyingCipher().getAlgorithmName());
+                pbeSpec = (PBEParameterSpec)params;
+                param = PBE.Util.makePBEParameters(k, params, cipher.getUnderlyingCipher().getAlgorithmName());
             }
             else
             {
@@ -796,7 +796,7 @@ else if (paramSpec instanceof PBEParameterSpec)
         else if (key instanceof PBEKey)
         {
             PBEKey k = (PBEKey)key;
-            pbeSpec = (PBEParameterSpec)paramSpec;
+            pbeSpec = (PBEParameterSpec)params;
             if (k instanceof PKCS12KeyWithParameters && pbeSpec == null)
             {
                 pbeSpec = new PBEParameterSpec(k.getSalt(), k.getIterationCount());
@@ -821,15 +821,15 @@ else if (!(key instanceof RepeatedSecretKeySpec))
             param = null;
         }
 
-        AlgorithmParameterSpec params;
-        if (paramSpec instanceof PBEParameterSpec)
-        {
-            params = ((PBEParameterSpec)paramSpec).getParameterSpec();
-        }
-        else
-        {
-            params = paramSpec;
-        }
+//        AlgorithmParameterSpec params;
+//        if (params instanceof PBEParameterSpec)
+//        {
+//            params = ((PBEParameterSpec)params).getParameterSpec();
+//        }
+//        else
+//        {
+//            params = params;
+//        }
 
         if (params instanceof AEADParameterSpec)
         {

prov/src/test/java/org/bouncycastle/jcajce/provider/test/jasypt/AlreadyInitializedException.java

@@ -0,0 +1,42 @@
+/*
+ * =============================================================================
+ * 
+ *   Copyright (c) 2007-2010, The JASYPT team (http://www.jasypt.org)
+ * 
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ * 
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ * 
+ * =============================================================================
+ */
+package org.bouncycastle.jcajce.provider.test.jasypt;
+
+
+/**
+ * Exception thrown when an attempt is made to change the configuration
+ * of an entity once it has been initialized.
+ * 
+ * 
+ * @since 1.0
+ * 
+ * @author Daniel Fernández
+ * 
+ */
+public final class AlreadyInitializedException
+    extends RuntimeException {
+    
+    private static final long serialVersionUID = 4592515503937873874L;
+
+    public AlreadyInitializedException() {
+        super("Encryption entity already initialized");
+    }
+
+}