Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42ef3bed authored by Antoine Tenart's avatar Antoine Tenart Committed by Herbert Xu
Browse files

crypto: inside-secure - fix invalidation check in hmac_sha1_setkey 



The safexcel_hmac_sha1_setkey function checks if an invalidation command
should be issued, i.e. when the context ipad/opad change. This checks is
done after filling the ipad/opad which and it can't be true. The patch
fixes this by moving the check before the ipad/opad memcpy operations.

Fixes: 1b44c5a6 ("crypto: inside-secure - add SafeXcel EIP197 crypto engine driver")
Signed-off-by: default avatarAntoine Tenart <antoine.tenart@free-electrons.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 41cdf7a4

drivers/crypto/inside-secure/safexcel_hash.c

+3 −3
Original line number Diff line number Diff line
@@ -883,9 +883,6 @@ static int safexcel_hmac_sha1_setkey(struct crypto_ahash *tfm, const u8 *key, 
	if (ret)

		return ret;



	memcpy(ctx->ipad, &istate.state, SHA1_DIGEST_SIZE);

	memcpy(ctx->opad, &ostate.state, SHA1_DIGEST_SIZE);



	for (i = 0; i < ARRAY_SIZE(istate.state); i++) {

		if (ctx->ipad[i] != le32_to_cpu(istate.state[i]) ||

		    ctx->opad[i] != le32_to_cpu(ostate.state[i])) {
@@ -894,6 +891,9 @@ static int safexcel_hmac_sha1_setkey(struct crypto_ahash *tfm, const u8 *key, 
		}

	}



	memcpy(ctx->ipad, &istate.state, SHA1_DIGEST_SIZE);

	memcpy(ctx->opad, &ostate.state, SHA1_DIGEST_SIZE);



	return 0;

}