diff options
| author | Tom Cosgrove <tom.cosgrove@arm.com> | 2022-07-18 10:24:47 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-07-19 12:14:33 +0200 |
| commit | 1efd8533e1ccc5c5e69795eb393a6b79b62e48e2 (patch) | |
| tree | 9ecc5e350b12d67105aa43c5d93569395fc0bb87 /crypto/aes | |
| parent | 7a16f179ab0bc2c474a754c0ad7e35b40534a38e (diff) | |
Fix aarch64 signed bit shift issue found by UBSAN
Also fix conditional branch out of range when using sanitisers.
Fixes #18813
Signed-off-by: Tom Cosgrove <tom.cosgrove@arm.com>
Change-Id: Ic543885091ed3ef2ddcbe21de0a4ac0bca1e2494
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18816)
Diffstat (limited to 'crypto/aes')
| -rw-r--r-- | crypto/aes/asm/bsaes-armv8.pl | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/crypto/aes/asm/bsaes-armv8.pl b/crypto/aes/asm/bsaes-armv8.pl index 1d1e886f03..b3058e38fa 100644 --- a/crypto/aes/asm/bsaes-armv8.pl +++ b/crypto/aes/asm/bsaes-armv8.pl @@ -1019,13 +1019,9 @@ _bsaes_key_convert: // No output registers, usual AAPCS64 register preservation ossl_bsaes_cbc_encrypt: cmp x2, #128 -#ifdef __APPLE__ bhs .Lcbc_do_bsaes b AES_cbc_encrypt .Lcbc_do_bsaes: -#else - blo AES_cbc_encrypt -#endif // it is up to the caller to make sure we are called with enc == 0 |