Commit d05fbdbe authored May 02, 2017 by Martin Hicks Committed by Greg Kroah-Hartman Jul 21, 2017

crypto: talitos - Extend max key length for SHA384/512-HMAC and AEAD



commit 03d2c5114c95797c0aa7d9f463348b171a274fd4 upstream.

An updated patch that also handles the additional key length requirements
for the AEAD algorithms.

The max keysize is not 96.  For SHA384/512 it's 128, and for the AEAD
algorithms it's longer still.  Extend the max keysize for the
AEAD size for AES256 + HMAC(SHA512).

Fixes: 357fb605 ("crypto: talitos - add sha224, sha384 and sha512 to existing AEAD algorithms")
Signed-off-by: Martin Hicks <mort@bork.org>
Acked-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 8f93a9aa

drivers/crypto/talitos.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -804,7 +804,7 @@ static void talitos_unregister_rng(struct device *dev)
		* crypto alg
		*/
		#define TALITOS_CRA_PRIORITY 3000
		#define TALITOS_MAX_KEY_SIZE 96
		#define TALITOS_MAX_KEY_SIZE (AES_MAX_KEY_SIZE + SHA512_BLOCK_SIZE)
		#define TALITOS_MAX_IV_LENGTH 16 /* max of AES_BLOCK_SIZE, DES3_EDE_BLOCK_SIZE */

		struct talitos_ctx {
		@@ -1388,6 +1388,11 @@ static int ablkcipher_setkey(struct crypto_ablkcipher *cipher,
		{
		struct talitos_ctx *ctx = crypto_ablkcipher_ctx(cipher);

		if (keylen > TALITOS_MAX_KEY_SIZE) {
		crypto_ablkcipher_set_flags(cipher, CRYPTO_TFM_RES_BAD_KEY_LEN);
		return -EINVAL;
		}

		memcpy(&ctx->key, key, keylen);
		ctx->keylen = keylen;