Commit 27f4adf7 authored by Tudor Ambarus's avatar Tudor Ambarus Committed by Herbert Xu
Browse files

crypto: atmel-{aes,tdes} - Update the IV only when the op succeeds 



Do not update the IV in case of errors.

Signed-off-by: default avatarTudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e9ce6aee

drivers/crypto/atmel-aes.c

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ static inline int atmel_aes_complete(struct atmel_aes_dev *dd, int err) 
	clk_disable(dd->iclk);

	dd->flags &= ~AES_FLAGS_BUSY;



	if (!dd->ctx->is_aead &&

	if (!err && !dd->ctx->is_aead &&

	    (rctx->mode & AES_FLAGS_OPMODE_MASK) != AES_FLAGS_ECB) {

		if ((rctx->mode & AES_FLAGS_OPMODE_MASK) != AES_FLAGS_CTR)

			atmel_aes_set_iv_as_last_ciphertext_block(dd);

drivers/crypto/atmel-tdes.c

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ static void atmel_tdes_finish_req(struct atmel_tdes_dev *dd, int err) 


	dd->flags &= ~TDES_FLAGS_BUSY;



	if ((rctx->mode & TDES_FLAGS_OPMODE_MASK) != TDES_FLAGS_ECB)

	if (!err && (rctx->mode & TDES_FLAGS_OPMODE_MASK) != TDES_FLAGS_ECB)

		atmel_tdes_set_iv_as_last_ciphertext_block(dd);



	req->base.complete(&req->base, err);

CRA Git | Maintained and supported by SUSTech CRA and CCSE