aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/crypto
diff options
context:
space:
mode:
authorKrzysztof Hałasa <khc@pm.waw.pl>2010-12-28 13:08:18 +0100
committerJason Cooper <jason@lakedaemon.net>2012-11-22 03:36:15 +0000
commit9792eb1d7296ad4e19c3219dabf65efd01562a73 (patch)
treeeac0dbdc523f4c0ab0073456278fd6c9aa753224 /drivers/crypto
parent4d18dea51036c673795eb9510fd8d70dcf214414 (diff)
downloadkernel_goldelico_gta04-9792eb1d7296ad4e19c3219dabf65efd01562a73.zip
kernel_goldelico_gta04-9792eb1d7296ad4e19c3219dabf65efd01562a73.tar.gz
kernel_goldelico_gta04-9792eb1d7296ad4e19c3219dabf65efd01562a73.tar.bz2
IXP4xx crypto: MOD_AES{128,192,256} already include key size.
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
Diffstat (limited to 'drivers/crypto')
-rw-r--r--drivers/crypto/ixp4xx_crypto.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c
index 8f3f74c..21180d6 100644
--- a/drivers/crypto/ixp4xx_crypto.c
+++ b/drivers/crypto/ixp4xx_crypto.c
@@ -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) {