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

Commit 3692bc31 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "crypto: crypto4xx - properly set IV after de- and encrypt" 



This reverts commit e9a60ab1 which is
commit fc340115ffb8235c1bbd200c28855e6373d0dd1a upstream.

Hauke writes that this breaks the build and should be reverted.

Reported-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Cc: Christian Lamparter <chunkeey@gmail.com>
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 39c7c903

drivers/crypto/amcc/crypto4xx_alg.c

+1 −2
Original line number Diff line number Diff line
@@ -138,8 +138,7 @@ static int crypto4xx_setkey_aes(struct crypto_ablkcipher *cipher, 
	sa = (struct dynamic_sa_ctl *) ctx->sa_in;

	ctx->hash_final = 0;



	set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, (cm == CRYPTO_MODE_CBC ?

				 SA_SAVE_IV : SA_NOT_SAVE_IV),

	set_dynamic_sa_command_0(sa, SA_NOT_SAVE_HASH, SA_NOT_SAVE_IV,

				 SA_LOAD_HASH_FROM_SA, SA_LOAD_IV_FROM_STATE,

				 SA_NO_HEADER_PROC, SA_HASH_ALG_NULL,

				 SA_CIPHER_ALG_AES, SA_PAD_TYPE_ZERO,

drivers/crypto/amcc/crypto4xx_core.c

+0 −9
Original line number Diff line number Diff line
@@ -645,15 +645,6 @@ static u32 crypto4xx_ablkcipher_done(struct crypto4xx_device *dev, 
		addr = dma_map_page(dev->core_dev->device, sg_page(dst),

				    dst->offset, dst->length, DMA_FROM_DEVICE);

	}



	if (pd_uinfo->sa_va->sa_command_0.bf.save_iv == SA_SAVE_IV) {

		struct crypto_skcipher *skcipher = crypto_skcipher_reqtfm(req);



		crypto4xx_memcpy_from_le32((u32 *)req->iv,

			pd_uinfo->sr_va->save_iv,

			crypto_skcipher_ivsize(skcipher));

	}



	crypto4xx_ret_sg_desc(dev, pd_uinfo);

	if (ablk_req->base.complete != NULL)

		ablk_req->base.complete(&ablk_req->base, 0);