Added support for encryption algorithms for symmetric keys

eng/code-quality-reports/src/main/resources/checkstyle/checkstyle-suppressions.xml

@@ -346,6 +346,10 @@
   <!-- InvalidKeyException is not a runtime exception, issue link: https://github.com/Azure/azure-sdk-for-java/issues/5178 -->
   <suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLogger"
             files="com.azure.security.keyvault.keys.cryptography.AesCbc.java"/>
+  <suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLogger"
+            files="com.azure.security.keyvault.keys.cryptography.AesCbcPad.java"/>
+  <suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLogger"
+            files="com.azure.security.keyvault.keys.cryptography.AesGcm.java"/>
 
   <!-- MSAL extension temporarily living in our package. Will not take dependency on azure-core once migrated to MSAL repo -->
   <suppress checks="com.azure.tools.checkstyle.checks.ThrowFromClientLogger"

sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/Aes128CbcPad.java

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.security.keyvault.keys.cryptography;
+
+class Aes128CbcPad extends AesCbcPad {
+    private static final int KEY_SIZE = 128;
+    public static final String ALGORITHM_NAME = "A128CBCPAD";
+
+    Aes128CbcPad() {
+        super(ALGORITHM_NAME, KEY_SIZE);
+    }
+}

sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/Aes128Gcm.java

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.security.keyvault.keys.cryptography;
+
+class Aes128Gcm extends AesGcm {
+    private static final int KEY_SIZE = 128;
+    public static final String ALGORITHM_NAME = "A128GCM";
+
+    Aes128Gcm() {
+        super(ALGORITHM_NAME, KEY_SIZE);
+    }
+}

sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/AesKw128.java → sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/Aes128Kw.java

@@ -10,13 +10,13 @@
 import java.security.Provider;
 import java.util.Arrays;
 
-class AesKw128 extends AesKw {
+class Aes128Kw extends AesKw {
 
     public static final String ALGORITHM_NAME = "A128KW";
 
     static final int KEY_SIZE_IN_BYTES = 128 >> 3;
 
-    AesKw128() {
+    Aes128Kw() {
         super(ALGORITHM_NAME);
     }
 

sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/Aes192CbcPad.java

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.security.keyvault.keys.cryptography;
+
+class Aes192CbcPad extends AesCbcPad {
+    private static final int KEY_SIZE = 192;
+    public static final String ALGORITHM_NAME = "A192CBCPAD";
+
+    Aes192CbcPad() {
+        super(ALGORITHM_NAME, KEY_SIZE);
+    }
+}

sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/Aes192Gcm.java

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.security.keyvault.keys.cryptography;
+
+class Aes192Gcm extends AesGcm {
+    private static final int KEY_SIZE = 192;
+    public static final String ALGORITHM_NAME = "A192GCM";
+
+    Aes192Gcm() {
+        super(ALGORITHM_NAME, KEY_SIZE);
+    }
+}

sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/AesKw192.java → sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/Aes192Kw.java

@@ -10,13 +10,13 @@
 import java.security.Provider;
 import java.util.Arrays;
 
-class AesKw192 extends AesKw {
+class Aes192Kw extends AesKw {
 
     public static final String ALGORITHM_NAME = "A192KW";
 
     static final int KEY_SIZE_IN_BYTES = 192 >> 3;
 
-    AesKw192() {
+    Aes192Kw() {
         super(ALGORITHM_NAME);
     }
 

sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/Aes256CbcPad.java

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.security.keyvault.keys.cryptography;
+
+class Aes256CbcPad extends AesCbcPad {
+    private static final int KEY_SIZE = 256;
+    public static final String ALGORITHM_NAME = "A256CBCPAD";
+
+    Aes256CbcPad() {
+        super(ALGORITHM_NAME, KEY_SIZE);
+    }
+}

sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/Aes256Gcm.java

@@ -0,0 +1,13 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.security.keyvault.keys.cryptography;
+
+class Aes256Gcm extends AesGcm {
+    private static final int KEY_SIZE = 256;
+    public static final String ALGORITHM_NAME = "A256GCM";
+
+    Aes256Gcm() {
+        super(ALGORITHM_NAME, KEY_SIZE);
+    }
+}

sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/AesKw256.java → sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/Aes256Kw.java

@@ -10,13 +10,13 @@
 import java.security.Provider;
 import java.util.Arrays;
 
-class AesKw256 extends AesKw {
+class Aes256Kw extends AesKw {
 
     public static final String ALGORITHM_NAME = "A256KW";
 
     static final int KEY_SIZE_IN_BYTES = 256 >> 3;
 
-    AesKw256() {
+    Aes256Kw() {
         super(ALGORITHM_NAME);
     }
 

sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/AesCbc.java

@@ -16,25 +16,30 @@
 import java.util.Arrays;
 
 abstract class AesCbc extends SymmetricEncryptionAlgorithm {
-
     final int keySizeInBytes;
     final int keySize;
-    static class AesCbcDecryptor implements ICryptoTransform {
 
+    protected AesCbc(String name, int size) {
+        super(name);
+
+        keySize = size;
+        keySizeInBytes = size >> 3;
+    }
+
+    static class AesCbcEncryptor implements ICryptoTransform {
         private final Cipher cipher;
 
-        AesCbcDecryptor(byte[] key, byte[] iv, Provider provider)
-            throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException,
-            InvalidAlgorithmParameterException {
+        AesCbcEncryptor(byte[] key, byte[] iv, Provider provider) throws NoSuchAlgorithmException,
+            NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException {
 
             // Create the cipher using the Provider if specified
             if (provider == null) {
-                cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+                cipher = Cipher.getInstance("AES/CBC/NoPadding");
             } else {
-                cipher = Cipher.getInstance("AES/CBC/PKCS5Padding", provider);
+                cipher = Cipher.getInstance("AES/CBC/NoPadding", provider);
             }
 
-            cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(key, "AES"), new IvParameterSpec(iv));
+            cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(key, "AES"), new IvParameterSpec(iv));
         }
 
         @Override
@@ -43,22 +48,20 @@ public byte[] doFinal(byte[] plaintext) throws IllegalBlockSizeException, BadPad
         }
     }
 
-    static class AesCbcEncryptor implements ICryptoTransform {
-
+    static class AesCbcDecryptor implements ICryptoTransform {
         private final Cipher cipher;
 
-        AesCbcEncryptor(byte[] key, byte[] iv, Provider provider)
-            throws NoSuchAlgorithmException, NoSuchPaddingException, InvalidKeyException,
-            InvalidAlgorithmParameterException {
+        AesCbcDecryptor(byte[] key, byte[] iv, Provider provider) throws NoSuchAlgorithmException,
+            NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException {
 
             // Create the cipher using the Provider if specified
             if (provider == null) {
-                cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+                cipher = Cipher.getInstance("AES/CBC/NoPadding");
             } else {
-                cipher = Cipher.getInstance("AES/CBC/PKCS5Padding", provider);
+                cipher = Cipher.getInstance("AES/CBC/NoPadding", provider);
             }
 
-            cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(key, "AES"), new IvParameterSpec(iv));
+            cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(key, "AES"), new IvParameterSpec(iv));
         }
 
         @Override
@@ -67,22 +70,12 @@ public byte[] doFinal(byte[] plaintext) throws IllegalBlockSizeException, BadPad
         }
     }
 
-    protected AesCbc(String name, int size) {
-        super(name);
-        keySize = size;
-        keySizeInBytes = size >> 3;
-    }
-
     @Override
     public ICryptoTransform createEncryptor(byte[] key, byte[] iv, byte[] authenticationData)
         throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException,
         InvalidAlgorithmParameterException {
 
-        if (key == null || key.length < keySizeInBytes) {
-            throw new InvalidKeyException("key must be at least " + keySize + " bits in length");
-        }
-
-        return new AesCbcEncryptor(Arrays.copyOfRange(key, 0, keySizeInBytes), iv, null);
+        return createEncryptor(key, iv, authenticationData, null);
     }
 
     @Override
@@ -91,7 +84,7 @@ public ICryptoTransform createEncryptor(byte[] key, byte[] iv, byte[] authentica
         InvalidAlgorithmParameterException {
 
         if (key == null || key.length < keySizeInBytes) {
-            throw new InvalidKeyException("key must be at least " + keySize + " bits in length");
+            throw new InvalidKeyException("Key must be at least " + keySize + " bits in length.");
         }
 
         return new AesCbcEncryptor(Arrays.copyOfRange(key, 0, keySizeInBytes), iv, provider);
@@ -102,11 +95,7 @@ public ICryptoTransform createDecryptor(byte[] key, byte[] iv, byte[] authentica
         throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException,
         InvalidAlgorithmParameterException {
 
-        if (key == null || key.length < keySizeInBytes) {
-            throw new InvalidKeyException("key must be at least " + keySize + " bits in length");
-        }
-
-        return new AesCbcDecryptor(Arrays.copyOfRange(key, 0, keySizeInBytes), iv, null);
+        return createDecryptor(key, iv, authenticationData, authenticationTag, null);
     }
 
     @Override
@@ -116,7 +105,7 @@ public ICryptoTransform createDecryptor(byte[] key, byte[] iv, byte[] authentica
         InvalidAlgorithmParameterException {
 
         if (key == null || key.length < keySizeInBytes) {
-            throw new InvalidKeyException("key must be at least " + keySize + " bits in length");
+            throw new InvalidKeyException("Key must be at least " + keySize + " bits in length.");
         }
 
         return new AesCbcDecryptor(Arrays.copyOfRange(key, 0, keySizeInBytes), iv, provider);

sdk/keyvault/azure-security-keyvault-keys/src/main/java/com/azure/security/keyvault/keys/cryptography/AesCbcPad.java

@@ -0,0 +1,113 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.security.keyvault.keys.cryptography;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.Cipher;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.security.InvalidAlgorithmParameterException;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.security.Provider;
+import java.util.Arrays;
+
+abstract class AesCbcPad extends SymmetricEncryptionAlgorithm {
+    final int keySizeInBytes;
+    final int keySize;
+
+    protected AesCbcPad(String name, int size) {
+        super(name);
+
+        keySize = size;
+        keySizeInBytes = size >> 3;
+    }
+
+    static class AesCbcPadEncryptor implements ICryptoTransform {
+        private final Cipher cipher;
+
+        AesCbcPadEncryptor(byte[] key, byte[] iv, Provider provider) throws NoSuchAlgorithmException,
+            NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException {
+
+            // Create the cipher using the Provider if specified
+            if (provider == null) {
+                cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+            } else {
+                cipher = Cipher.getInstance("AES/CBC/PKCS5Padding", provider);
+            }
+
+            cipher.init(Cipher.ENCRYPT_MODE, new SecretKeySpec(key, "AES"), new IvParameterSpec(iv));
+        }
+
+        @Override
+        public byte[] doFinal(byte[] plaintext) throws IllegalBlockSizeException, BadPaddingException {
+            return cipher.doFinal(plaintext);
+        }
+    }
+
+    static class AesCbcPadDecryptor implements ICryptoTransform {
+        private final Cipher cipher;
+
+        AesCbcPadDecryptor(byte[] key, byte[] iv, Provider provider) throws NoSuchAlgorithmException,
+            NoSuchPaddingException, InvalidKeyException, InvalidAlgorithmParameterException {
+
+            // Create the cipher using the Provider if specified
+            if (provider == null) {
+                cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+            } else {
+                cipher = Cipher.getInstance("AES/CBC/PKCS5Padding", provider);
+            }
+
+            cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(key, "AES"), new IvParameterSpec(iv));
+        }
+
+        @Override
+        public byte[] doFinal(byte[] plaintext) throws IllegalBlockSizeException, BadPaddingException {
+            return cipher.doFinal(plaintext);
+        }
+    }
+
+    @Override
+    public ICryptoTransform createEncryptor(byte[] key, byte[] iv, byte[] authenticationData)
+        throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException,
+        InvalidAlgorithmParameterException {
+
+        return createEncryptor(key, iv, authenticationData, null);
+    }
+
+    @Override
+    public ICryptoTransform createEncryptor(byte[] key, byte[] iv, byte[] authenticationData, Provider provider)
+        throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException,
+        InvalidAlgorithmParameterException {
+
+        if (key == null || key.length < keySizeInBytes) {
+            throw new InvalidKeyException("key must be at least " + keySize + " bits in length");
+        }
+
+        return new AesCbcPadEncryptor(Arrays.copyOfRange(key, 0, keySizeInBytes), iv, provider);
+    }
+
+    @Override
+    public ICryptoTransform createDecryptor(byte[] key, byte[] iv, byte[] authenticationData, byte[] authenticationTag)
+        throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException,
+        InvalidAlgorithmParameterException {
+
+        return createDecryptor(key, iv, authenticationData, authenticationTag, null);
+    }
+
+    @Override
+    public ICryptoTransform createDecryptor(byte[] key, byte[] iv, byte[] authenticationData, byte[] authenticationTag,
+                                            Provider provider)
+        throws InvalidKeyException, NoSuchAlgorithmException, NoSuchPaddingException,
+        InvalidAlgorithmParameterException {
+
+        if (key == null || key.length < keySizeInBytes) {
+            throw new InvalidKeyException("key must be at least " + keySize + " bits in length");
+        }
+
+        return new AesCbcPadDecryptor(Arrays.copyOfRange(key, 0, keySizeInBytes), iv, provider);
+    }
+}