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

Commit 4dbeae42 authored by Harsh Jain's avatar Harsh Jain Committed by Herbert Xu
Browse files

crypto: chcr - Fix fallback key setting 



Set key of fallback tfm for rfc4309.

Signed-off-by: default avatarHarsh Jain <harsh@chelsio.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2512a624

drivers/crypto/chelsio/chcr_algo.c

+11 −1
Original line number Original line Diff line number Diff line
@@ -2211,6 +2211,7 @@ static int chcr_aead_rfc4309_setkey(struct crypto_aead *aead, const u8 *key, 
{

{

	struct chcr_context *ctx = crypto_aead_ctx(aead);

	struct chcr_context *ctx = crypto_aead_ctx(aead);

	struct chcr_aead_ctx *aeadctx = AEAD_CTX(ctx);

	struct chcr_aead_ctx *aeadctx = AEAD_CTX(ctx);

	int error;





	if (keylen < 3) {

	if (keylen < 3) {

		crypto_tfm_set_flags((struct crypto_tfm *)aead,

		crypto_tfm_set_flags((struct crypto_tfm *)aead,
@@ -2218,6 +2219,15 @@ static int chcr_aead_rfc4309_setkey(struct crypto_aead *aead, const u8 *key, 
		aeadctx->enckey_len = 0;

		aeadctx->enckey_len = 0;

		return	-EINVAL;

		return	-EINVAL;

	}

	}

	crypto_aead_clear_flags(aeadctx->sw_cipher, CRYPTO_TFM_REQ_MASK);

	crypto_aead_set_flags(aeadctx->sw_cipher, crypto_aead_get_flags(aead) &

			      CRYPTO_TFM_REQ_MASK);

	error = crypto_aead_setkey(aeadctx->sw_cipher, key, keylen);

	crypto_aead_clear_flags(aead, CRYPTO_TFM_RES_MASK);

	crypto_aead_set_flags(aead, crypto_aead_get_flags(aeadctx->sw_cipher) &

			      CRYPTO_TFM_RES_MASK);

	if (error)

		return error;

	keylen -= 3;

	keylen -= 3;

	memcpy(aeadctx->salt, key + keylen, 3);

	memcpy(aeadctx->salt, key + keylen, 3);

	return chcr_ccm_common_setkey(aead, key, keylen);

	return chcr_ccm_common_setkey(aead, key, keylen);