crypto: talitos - Extend max key length for SHA384/512-HMAC and AEAD (03d2c511) · Commits · 戴 / test

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). Cc: <stable@vger.kernel.org> # 3.6+ Fixes: ("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>

drivers/crypto/talitos.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -816,7 +816,7 @@ static void talitos_unregister_rng(struct device *dev)
		* HMAC_SNOOP_NO_AFEA (HSNA) instead of type IPSEC_ESP
		*/
		#define TALITOS_CRA_PRIORITY_AEAD_HSNA (TALITOS_CRA_PRIORITY - 1)
		#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 {
		@@ -1495,6 +1495,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;

Admin message