Merge pull request #143 from cconlon/CipherInitMode

Throw correct InvalidParameterException from Cipher.init() on unsupported mode

Author: rlm2002

src/main/java/com/wolfssl/provider/jce/WolfCryptCipher.java

@@ -42,6 +42,7 @@
 import java.security.Key;
 import java.security.NoSuchAlgorithmException;
 import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidParameterException;
 import java.security.InvalidKeyException;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.interfaces.RSAPublicKey;
@@ -522,8 +523,8 @@ private void wolfCryptSetDirection(int opmode)
                 break;
 
             default:
-                throw new InvalidKeyException(
-                    "Cipher opmode must be ENCRYPT_MODE or DECRPYT_MODE");
+                throw new InvalidParameterException(
+                    "Cipher opmode must be ENCRYPT_MODE or DECRYPT_MODE");
         }
     }
 

src/test/java/com/wolfssl/provider/jce/test/WolfCryptCipherTest.java

@@ -61,6 +61,7 @@
 import java.security.InvalidKeyException;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.AlgorithmParameters;
+import java.security.InvalidParameterException;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.AlgorithmParameters;
 
@@ -194,6 +195,35 @@ public void testGetBlockSize()
         }
     }
 
+    @Test
+    public void testAesInvalidModeThrowsInvalidParameterException()
+        throws NoSuchProviderException, NoSuchAlgorithmException,
+               NoSuchPaddingException, InvalidKeyException,
+               InvalidAlgorithmParameterException {
+
+        Cipher cipher;
+
+        try {
+            cipher = Cipher.getInstance("AES/CBC/NoPadding", jceProvider);
+        } catch (NoSuchAlgorithmException e) {
+            /* skip if AES-CBC is not enabled */
+            return;
+        }
+
+        SecretKeySpec keySpec = new SecretKeySpec(new byte[16], "AES");
+        IvParameterSpec ivSpec = new IvParameterSpec(new byte[16]);
+
+        int invalidMode = 100;
+
+        try {
+            cipher.init(invalidMode, keySpec, ivSpec);
+            fail("Cipher.init() with invalid mode should throw " +
+                 "InvalidParameterException");
+        } catch (InvalidParameterException e) {
+            /* expected */
+        }
+    }
+
     @Test
     public void testAesCbcNoPadding()
         throws NoSuchProviderException, NoSuchAlgorithmException,