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

Commit 96a74f7b authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Herbert Xu
Browse files

crypto: arm64/aes-cipher - move S-box to .rodata section 



Move the AES inverse S-box to the .rodata section where it is safe from
abuse by speculation.

Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent cd0bb67f

arch/arm64/crypto/aes-cipher-core.S

+10 −9
Original line number Diff line number Diff line
@@ -125,6 +125,16 @@ CPU_BE( rev w7, w7 ) 
	ret

	.endm



ENTRY(__aes_arm64_encrypt)

	do_crypt	fround, crypto_ft_tab, crypto_ft_tab + 1, 2

ENDPROC(__aes_arm64_encrypt)



	.align		5

ENTRY(__aes_arm64_decrypt)

	do_crypt	iround, crypto_it_tab, __aes_arm64_inverse_sbox, 0

ENDPROC(__aes_arm64_decrypt)



	.section	".rodata", "a"

	.align		L1_CACHE_SHIFT

	.type		__aes_arm64_inverse_sbox, %object

__aes_arm64_inverse_sbox:
@@ -161,12 +171,3 @@ __aes_arm64_inverse_sbox: 
	.byte		0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26

	.byte		0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d

	.size		__aes_arm64_inverse_sbox, . - __aes_arm64_inverse_sbox
 


ENTRY(__aes_arm64_encrypt)

	do_crypt	fround, crypto_ft_tab, crypto_ft_tab + 1, 2

ENDPROC(__aes_arm64_encrypt)



	.align		5

ENTRY(__aes_arm64_decrypt)

	do_crypt	iround, crypto_it_tab, __aes_arm64_inverse_sbox, 0

ENDPROC(__aes_arm64_decrypt)