Merge pull request #142 from cconlon/CipherGenericAes

Add `Cipher.getInstance("AES")` support

Author: rlm2002

README_JCE.md

@@ -107,7 +107,7 @@ The JCE provider currently supports the following algorithms:
         AES/CCM/NoPadding
         AES/CTR/NoPadding
         AES/ECB/NoPadding
-        AES/ECB/PKCS5Padding
+        AES/ECB/PKCS5Padding (aliased also as: AES)
         AES/GCM/NoPadding
         AES/OFB/NoPadding
         DESede/CBC/NoPadding

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

@@ -281,6 +281,13 @@ private void registerServices() {
                 "com.wolfssl.provider.jce.WolfCryptCipher$wcAESECBNoPadding");
             put("Cipher.AES/ECB/PKCS5Padding",
                 "com.wolfssl.provider.jce.WolfCryptCipher$wcAESECBPKCS5Padding");
+
+            /* SunJCE and Bouncy Castle alias AES to AES/ECB/PKCS5Padding,
+             * we do the same here for compatibility. */
+            put("Cipher.AES",
+                "com.wolfssl.provider.jce.WolfCryptCipher$wcAESECBPKCS5Padding");
+            put("Cipher.AES SupportedModes", "ECB");
+            put("Cipher.AES SupportedPaddings", "NoPadding, PKCS5Padding");
         }
         if (FeatureDetect.AesCtrEnabled()) {
             put("Cipher.AES/CTR/NoPadding",

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

@@ -78,6 +78,7 @@ public class WolfCryptCipherTest {
         "AES/CCM/NoPadding",
         "AES/CTR/NoPadding",
         "AES/ECB/NoPadding",
+        "AES", /* maps to AES/ECB/PKCS5Padding */
         "AES/ECB/PKCS5Padding",
         "AES/GCM/NoPadding",
         "AES/OFB/NoPadding",
@@ -138,6 +139,7 @@ public static void testProviderInstallationAtRuntime()
         expectedBlockSizes.put("AES/CCM/NoPadding", 16);
         expectedBlockSizes.put("AES/CTR/NoPadding", 16);
         expectedBlockSizes.put("AES/ECB/NoPadding", 16);
+        expectedBlockSizes.put("AES", 16);
         expectedBlockSizes.put("AES/ECB/PKCS5Padding", 16);
         expectedBlockSizes.put("AES/GCM/NoPadding", 16);
         expectedBlockSizes.put("AES/OFB/NoPadding", 16);
@@ -761,6 +763,63 @@ public void testAesCbcNoPaddingBigMessage()
         assertArrayEquals(plain, input);
     }
 
+    /* Cipher.getInstance("AES") is just AES/ECB/PKCS5Padding, so we
+     * do one test that here. */
+    @Test
+    public void testAesGeneric()
+        throws NoSuchProviderException, NoSuchAlgorithmException,
+               NoSuchPaddingException, InvalidKeyException,
+               IllegalBlockSizeException, InvalidAlgorithmParameterException,
+               BadPaddingException {
+
+        if (!FeatureDetect.AesEcbEnabled()) {
+            /* skip if AES is not enabled */
+            return;
+        }
+
+        byte key[] = new byte[] {
+            (byte)0x2b, (byte)0x7e, (byte)0x15, (byte)0x16,
+            (byte)0x28, (byte)0xae, (byte)0xd2, (byte)0xa6,
+            (byte)0xab, (byte)0xf7, (byte)0x15, (byte)0x88,
+            (byte)0x09, (byte)0xcf, (byte)0x4f, (byte)0x3c
+        };
+
+        /* Test with data that needs padding.
+         * 12 bytes, needs 4 bytes padding */
+        byte input[] = "Hello World!".getBytes();
+
+        Cipher cipher = Cipher.getInstance("AES", jceProvider);
+        SecretKeySpec keySpec = new SecretKeySpec(key, "AES");
+
+        /* Test encryption */
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec);
+        byte[] ciphertext = cipher.doFinal(input);
+
+        /* Ciphertext should be block-aligned (16 bytes) */
+        assertEquals(16, ciphertext.length);
+
+        /* Test decryption */
+        cipher.init(Cipher.DECRYPT_MODE, keySpec);
+        byte[] decrypted = cipher.doFinal(ciphertext);
+
+        assertArrayEquals(input, decrypted);
+
+        /* Test with exact block size data */
+        byte blockSizeInput[] = new byte[16];
+        Arrays.fill(blockSizeInput, (byte)0x41); /* Fill with 'A' */
+
+        cipher.init(Cipher.ENCRYPT_MODE, keySpec);
+        byte[] blockCiphertext = cipher.doFinal(blockSizeInput);
+
+        /* Should be 32 bytes (original 16 + 16 bytes padding) */
+        assertEquals(32, blockCiphertext.length);
+
+        cipher.init(Cipher.DECRYPT_MODE, keySpec);
+        byte[] blockDecrypted = cipher.doFinal(blockCiphertext);
+
+        assertArrayEquals(blockSizeInput, blockDecrypted);
+    }
+
     @Test
     public void testAesCbcPKCS5Padding()
         throws NoSuchProviderException, NoSuchAlgorithmException,
@@ -4339,7 +4398,8 @@ public void testIVConsistencyAcrossOperations() throws Exception {
         /* Test all enabled cipher modes that use IVs (exclude RSA and ECB) */
         for (String mode : enabledJCEAlgos) {
             /* Skip modes that don't use IVs */
-            if (mode.startsWith("RSA") || mode.contains("/ECB/")) {
+            if (mode.startsWith("RSA") || mode.contains("/ECB/") ||
+                mode.equals("AES")) {
                 continue;
             }
 
@@ -4368,14 +4428,15 @@ private void testIVConsistencyForMode(String algorithm) throws Exception {
         /* Generate test key */
         if (algorithm.startsWith("AES")) {
             key = new byte[16]; /* AES-128 */
+            keySpec = new SecretKeySpec(key, "AES");
         } else if (algorithm.startsWith("DESede")) {
             key = new byte[24]; /* 3DES */
+            keySpec = new SecretKeySpec(key, "DESede");
         } else {
             return; /* Unsupported algorithm */
         }
 
         secureRandom.nextBytes(key);
-        keySpec = new SecretKeySpec(key, algorithm.split("/")[0]);
 
         /* Generate test data of various sizes to ensure robustness */
         for (int dataSize : testSizes) {
@@ -4399,8 +4460,9 @@ private void testIVConsistencyForModeAndSize(String algorithm,
         byte[] ivAfterDecryption;
 
         /* Skip sizes that would cause issues with block ciphers */
-        if ((algorithm.contains("CBC") || algorithm.contains("ECB")) &&
-            algorithm.contains("NoPadding") && (dataSize % 16 != 0)) {
+        if ((algorithm.equals("AES") ||
+            ((algorithm.contains("CBC") || algorithm.contains("ECB")) &&
+            algorithm.contains("NoPadding"))) && (dataSize % 16 != 0)) {
             return; /* Block size must be multiple of 16 for NoPadding */
         }
         if (algorithm.startsWith("DESede") &&