summaryrefslogtreecommitdiffstats
path: root/lib/crypto
diff options
context:
space:
mode:
authorIuliana Prodan <iuliana.prodan@nxp.com>2019-07-31 16:05:55 +0300
committerHerbert Xu <herbert@gondor.apana.org.au>2019-08-09 15:11:43 +1000
commitbc67d04e75260942fb534fb91673103dcad7ca96 (patch)
tree7a32f21ca3a91c5eddf22fa8a06ac13f1ecad681 /lib/crypto
parent65526f638efc6435b9658d45a3ddd07e6fdbbb7d (diff)
downloadlinux-stable-bc67d04e75260942fb534fb91673103dcad7ca96.tar.gz
linux-stable-bc67d04e75260942fb534fb91673103dcad7ca96.tar.bz2
linux-stable-bc67d04e75260942fb534fb91673103dcad7ca96.zip
crypto: aes - helper function to validate key length for AES algorithms
Add inline helper function to check key length for AES algorithms. The key can be 128, 192 or 256 bits size. This function is used in the generic aes implementation. Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'lib/crypto')
-rw-r--r--lib/crypto/aes.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/crypto/aes.c b/lib/crypto/aes.c
index 4e100af38c51..827fe89922ff 100644
--- a/lib/crypto/aes.c
+++ b/lib/crypto/aes.c
@@ -187,11 +187,11 @@ int aes_expandkey(struct crypto_aes_ctx *ctx, const u8 *in_key,
{
u32 kwords = key_len / sizeof(u32);
u32 rc, i, j;
+ int err;
- if (key_len != AES_KEYSIZE_128 &&
- key_len != AES_KEYSIZE_192 &&
- key_len != AES_KEYSIZE_256)
- return -EINVAL;
+ err = aes_check_keylen(key_len);
+ if (err)
+ return err;
ctx->key_length = key_len;