diff options
| author | Jamie Iles <jamie@jamieiles.com> | 2011-12-13 09:54:06 +0000 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2011-12-20 15:20:05 +0800 |
| commit | a9c57a9c6afb41951aa08317d0cd65a66aed38df (patch) | |
| tree | 2dcb1dfedfd642ff03da7e1f1afc43baaebc80e1 /drivers | |
| parent | a1a38c4c6a0f73e8a9dc217c0e4e0ac483a89f25 (diff) | |
| download | linux-3.10-a9c57a9c6afb41951aa08317d0cd65a66aed38df.tar.gz linux-3.10-a9c57a9c6afb41951aa08317d0cd65a66aed38df.tar.bz2 linux-3.10-a9c57a9c6afb41951aa08317d0cd65a66aed38df.zip | |
crypto: picoxcell - fix boolean and / or confusion
The AES engine only supports 128 and 256 bit keys so we should correctly
test for that.
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Reported-by: Joe Perches <joe@perches.com>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/crypto/picoxcell_crypto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c index 9b1571c2a5a..58480d00932 100644 --- a/drivers/crypto/picoxcell_crypto.c +++ b/drivers/crypto/picoxcell_crypto.c @@ -873,7 +873,7 @@ static int spacc_aes_setkey(struct crypto_ablkcipher *cipher, const u8 *key, * request for any other size (192 bits) then we need to do a software * fallback. */ - if ((len != AES_KEYSIZE_128 || len != AES_KEYSIZE_256) && + if (len != AES_KEYSIZE_128 && len != AES_KEYSIZE_256 && ctx->sw_cipher) { /* * Set the fallback transform to use the same request flags as @@ -886,7 +886,7 @@ static int spacc_aes_setkey(struct crypto_ablkcipher *cipher, const u8 *key, err = crypto_ablkcipher_setkey(ctx->sw_cipher, key, len); if (err) goto sw_setkey_failed; - } else if ((len != AES_KEYSIZE_128 || len != AES_KEYSIZE_256) && + } else if (len != AES_KEYSIZE_128 && len != AES_KEYSIZE_256 && !ctx->sw_cipher) err = -EINVAL; |