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

Commit e6efaa02 authored by Huang Ying's avatar Huang Ying Committed by Herbert Xu
Browse files

crypto: aes-ni - Fix cbc mode IV saving 



Original implementation of aesni_cbc_dec do not save IV if input
length % 4 == 0. This will make decryption of next block failed.

Signed-off-by: default avatarHuang Ying <ying.huang@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 8d8409f7

arch/x86/crypto/aesni-intel_asm.S

+3 −2
Original line number Diff line number Diff line
@@ -845,7 +845,7 @@ ENTRY(aesni_cbc_enc) 
 */

ENTRY(aesni_cbc_dec)

	cmp $16, LEN

	jb .Lcbc_dec_ret

	jb .Lcbc_dec_just_ret

	mov 480(KEYP), KLEN

	add $240, KEYP

	movups (IVP), IV
@@ -891,6 +891,7 @@ ENTRY(aesni_cbc_dec) 
	add $16, OUTP

	cmp $16, LEN

	jge .Lcbc_dec_loop1

	movups IV, (IVP)

.Lcbc_dec_ret:

	movups IV, (IVP)

.Lcbc_dec_just_ret:

	ret