diff options
| author | Tom Cosgrove <tom.cosgrove@arm.com> | 2022-02-07 14:44:56 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2023-10-02 16:12:49 +0000 |
| commit | 41777819236110907dd4cff98ef70dfd0629f744 (patch) | |
| tree | f375d33474cc59b4ba58b6a358fd1208102e603f /crypto | |
| parent | 1bd9ca8b7548e5f573ae8186f3519f4bedff3a92 (diff) | |
| download | src-41777819236110907dd4cff98ef70dfd0629f744.tar.gz src-41777819236110907dd4cff98ef70dfd0629f744.zip | |
aarch64: fix branch target indications in arm64cpuid.pl and keccak1600
Add missing AARCH64_VALID_CALL_TARGET to armv8_rng_probe(). Also add
these to the functions defined by gen_random(), and note that this Perl
sub prints the assembler out directly, not going via the $code xlate
mechanism (and therefore coming before the include of arm_arch.h). So
fix this too.
In KeccakF1600_int, AARCH64_SIGN_LINK_REGISTER functions as
AARCH64_VALID_CALL_TARGET on BTI-only builds, so it needs to come before
the 'adr' line.
Change-Id: If241efe71591c88253a3e36647ced00300c3c1a3
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17653)
Obtained from: OpenSSL 3a23f01268ec
Diffstat (limited to 'crypto')
| -rwxr-xr-x | crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl b/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl index cf54b62c636a..40f7aa7a695a 100755 --- a/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl +++ b/crypto/openssl/crypto/sha/asm/keccak1600-armv8.pl @@ -126,8 +126,8 @@ $code.=<<___; .type KeccakF1600_int,%function .align 5 KeccakF1600_int: - adr $C[2],iotas AARCH64_SIGN_LINK_REGISTER + adr $C[2],iotas stp $C[2],x30,[sp,#16] // 32 bytes on top are mine b .Loop .align 4 |