Skip to content

Commit

Permalink
aarch64: fix BTI in bsaes assembly code
Browse files Browse the repository at this point in the history
Change-Id: I63f0fb2af5eb9cea515dec96485325f8efd50511

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
(Merged from #23982)

(cherry picked from commit 88c74fe)
  • Loading branch information
tom-cosgrove-arm authored and t8m committed Apr 10, 2024
1 parent bde5d6f commit 596eb26
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion crypto/aes/asm/bsaes-armv8.pl
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,7 @@ sub data
// Initialisation vector overwritten with last quadword of ciphertext
// No output registers, usual AAPCS64 register preservation
ossl_bsaes_cbc_encrypt:
AARCH64_VALID_CALL_TARGET
cmp x2, #128
bhs .Lcbc_do_bsaes
b AES_cbc_encrypt
Expand Down Expand Up @@ -1270,7 +1271,7 @@ sub data
// Output text filled in
// No output registers, usual AAPCS64 register preservation
ossl_bsaes_ctr32_encrypt_blocks:
AARCH64_VALID_CALL_TARGET
cmp x2, #8 // use plain AES for
blo .Lctr_enc_short // small sizes
Expand Down Expand Up @@ -1476,6 +1477,7 @@ sub data
// Output ciphertext filled in
// No output registers, usual AAPCS64 register preservation
ossl_bsaes_xts_encrypt:
AARCH64_VALID_CALL_TARGET
// Stack layout:
// sp ->
// nrounds*128-96 bytes: key schedule
Expand Down Expand Up @@ -1921,6 +1923,7 @@ sub data
// Output plaintext filled in
// No output registers, usual AAPCS64 register preservation
ossl_bsaes_xts_decrypt:
AARCH64_VALID_CALL_TARGET
// Stack layout:
// sp ->
// nrounds*128-96 bytes: key schedule
Expand Down

0 comments on commit 596eb26

Please sign in to comment.