diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-08 21:48:14 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-08 21:48:14 +0000 |
commit | 4fe1c12da4f12ba7ded9eeaf948a3e105ea913b4 (patch) | |
tree | 3fbaba7a4481abb2036e6cae6d9d91de101f666b /apple-aarch64/crypto/fipsmodule/sha1-armv8-apple.S | |
parent | ee57e9a31e1eef7ac487761a2f9161ba7518f3a1 (diff) | |
parent | dc3a035f4907d0d7a04be2a0af151e35f04b073c (diff) | |
download | boringssl-4fe1c12da4f12ba7ded9eeaf948a3e105ea913b4.tar.gz |
Snap for 11286485 from dc3a035f4907d0d7a04be2a0af151e35f04b073c to emu-34-release
Change-Id: Iabe554486f2e8d52fcd3e3585a4d2460de7d9f1a
Diffstat (limited to 'apple-aarch64/crypto/fipsmodule/sha1-armv8-apple.S')
-rw-r--r-- | apple-aarch64/crypto/fipsmodule/sha1-armv8-apple.S | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/apple-aarch64/crypto/fipsmodule/sha1-armv8-apple.S b/apple-aarch64/crypto/fipsmodule/sha1-armv8-apple.S index 744c6306..8f847749 100644 --- a/apple-aarch64/crypto/fipsmodule/sha1-armv8-apple.S +++ b/apple-aarch64/crypto/fipsmodule/sha1-armv8-apple.S @@ -8,23 +8,13 @@ .text - -.private_extern _OPENSSL_armcap_P -.globl _sha1_block_data_order -.private_extern _sha1_block_data_order +.globl _sha1_block_data_order_nohw +.private_extern _sha1_block_data_order_nohw .align 6 -_sha1_block_data_order: +_sha1_block_data_order_nohw: // Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later. AARCH64_VALID_CALL_TARGET -#if defined(OPENSSL_HWASAN) && __clang_major__ >= 10 - adrp x16,:pg_hi21_nc:_OPENSSL_armcap_P -#else - adrp x16,_OPENSSL_armcap_P@PAGE -#endif - ldr w16,[x16,_OPENSSL_armcap_P@PAGEOFF] - tst w16,#ARMV8_SHA1 - b.ne Lv8_entry stp x29,x30,[sp,#-96]! add x29,sp,#0 @@ -1081,12 +1071,13 @@ Loop: ldr x29,[sp],#96 ret +.globl _sha1_block_data_order_hw +.private_extern _sha1_block_data_order_hw .align 6 -sha1_block_armv8: +_sha1_block_data_order_hw: // Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later. AARCH64_VALID_CALL_TARGET -Lv8_entry: stp x29,x30,[sp,#-16]! add x29,sp,#0 |