summaryrefslogtreecommitdiff
path: root/win-aarch64/crypto/fipsmodule/sha512-armv8-win.S
diff options
context:
space:
mode:
Diffstat (limited to 'win-aarch64/crypto/fipsmodule/sha512-armv8-win.S')
-rw-r--r--win-aarch64/crypto/fipsmodule/sha512-armv8-win.S28
1 files changed, 9 insertions, 19 deletions
diff --git a/win-aarch64/crypto/fipsmodule/sha512-armv8-win.S b/win-aarch64/crypto/fipsmodule/sha512-armv8-win.S
index 1e56b0b0..220f4891 100644
--- a/win-aarch64/crypto/fipsmodule/sha512-armv8-win.S
+++ b/win-aarch64/crypto/fipsmodule/sha512-armv8-win.S
@@ -50,26 +50,13 @@
.text
+.globl sha512_block_data_order_nohw
-
-.globl sha512_block_data_order
-
-.def sha512_block_data_order
+.def sha512_block_data_order_nohw
.type 32
.endef
.align 6
-sha512_block_data_order:
- AARCH64_VALID_CALL_TARGET
-#ifndef __KERNEL__
-#if defined(OPENSSL_HWASAN) && __clang_major__ >= 10
- adrp x16,:pg_hi21_nc:OPENSSL_armcap_P
-#else
- adrp x16,OPENSSL_armcap_P
-#endif
- ldr w16,[x16,:lo12:OPENSSL_armcap_P]
- tst w16,#ARMV8_SHA512
- b.ne Lv8_entry
-#endif
+sha512_block_data_order_nohw:
AARCH64_SIGN_LINK_REGISTER
stp x29,x30,[sp,#-128]!
add x29,sp,#0
@@ -1086,12 +1073,15 @@ LK512:
.align 2
.text
#ifndef __KERNEL__
-.def sha512_block_armv8
+.globl sha512_block_data_order_hw
+
+.def sha512_block_data_order_hw
.type 32
.endef
.align 6
-sha512_block_armv8:
-Lv8_entry:
+sha512_block_data_order_hw:
+ // Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
+ AARCH64_VALID_CALL_TARGET
stp x29,x30,[sp,#-16]!
add x29,sp,#0