diff options
| author | Krzysztof Hałasa <khc@pm.waw.pl> | 2010-12-28 07:08:18 -0500 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2012-11-21 22:36:15 -0500 |
| commit | 9792eb1d7296ad4e19c3219dabf65efd01562a73 (patch) | |
| tree | eac0dbdc523f4c0ab0073456278fd6c9aa753224 | |
| parent | 4d18dea51036c673795eb9510fd8d70dcf214414 (diff) | |
IXP4xx crypto: MOD_AES{128,192,256} already include key size.
Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
| -rw-r--r-- | drivers/crypto/ixp4xx_crypto.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c index 8f3f74ce8c7f..21180d6cad6e 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, | |||
| 750 | } | 750 | } |
| 751 | if (cipher_cfg & MOD_AES) { | 751 | if (cipher_cfg & MOD_AES) { |
| 752 | switch (key_len) { | 752 | switch (key_len) { |
| 753 | case 16: keylen_cfg = MOD_AES128 | KEYLEN_128; break; | 753 | case 16: keylen_cfg = MOD_AES128; break; |
| 754 | case 24: keylen_cfg = MOD_AES192 | KEYLEN_192; break; | 754 | case 24: keylen_cfg = MOD_AES192; break; |
| 755 | case 32: keylen_cfg = MOD_AES256 | KEYLEN_256; break; | 755 | case 32: keylen_cfg = MOD_AES256; break; |
| 756 | default: | 756 | default: |
| 757 | *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; | 757 | *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN; |
| 758 | return -EINVAL; | 758 | return -EINVAL; |
| 759 | } | 759 | } |
| 760 | cipher_cfg |= keylen_cfg; | 760 | cipher_cfg |= keylen_cfg; |
| 761 | } else if (cipher_cfg & MOD_3DES) { | 761 | } else if (cipher_cfg & MOD_3DES) { |