]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
IXP4xx crypto: MOD_AES{128,192,256} already include key size.
authorKrzysztof Hałasa <khc@pm.waw.pl>
Tue, 28 Dec 2010 12:08:18 +0000 (13:08 +0100)
committerJason Cooper <jason@lakedaemon.net>
Thu, 22 Nov 2012 03:36:15 +0000 (03:36 +0000)
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
drivers/crypto/ixp4xx_crypto.c

index 8f3f74ce8c7fd7ac95e241c2c4504f06a52da38c..21180d6cad6e27f2f316a04b1e98fb2e61ac90d3 100644 (file)
@@ -750,12 +750,12 @@ static int setup_cipher(struct crypto_tfm *tfm, int encrypt,
        }
        if (cipher_cfg & MOD_AES) {
                switch (key_len) {
-                       case 16: keylen_cfg = MOD_AES128 | KEYLEN_128; break;
-                       case 24: keylen_cfg = MOD_AES192 | KEYLEN_192; break;
-                       case 32: keylen_cfg = MOD_AES256 | KEYLEN_256; break;
-                       default:
-                               *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
-                               return -EINVAL;
+               case 16: keylen_cfg = MOD_AES128; break;
+               case 24: keylen_cfg = MOD_AES192; break;
+               case 32: keylen_cfg = MOD_AES256; break;
+               default:
+                       *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
+                       return -EINVAL;
                }
                cipher_cfg |= keylen_cfg;
        } else if (cipher_cfg & MOD_3DES) {