projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix typo in CONTRIBUTING.md
[openssl.git]
/
crypto
/
sha
/
asm
/
sha1-armv8.pl
diff --git
a/crypto/sha/asm/sha1-armv8.pl
b/crypto/sha/asm/sha1-armv8.pl
index cdea8845af85a57df33a3f6b60a1f29684e5d7df..5f23a20c1ab7907e72e66e84433e1e44a660509e 100644
(file)
--- a/
crypto/sha/asm/sha1-armv8.pl
+++ b/
crypto/sha/asm/sha1-armv8.pl
@@
-175,8
+175,8
@@
___
}
$code.=<<___;
}
$code.=<<___;
+#include "arm_arch.h"
#ifndef __KERNEL__
#ifndef __KERNEL__
-# include "arm_arch.h"
.extern OPENSSL_armcap_P
.hidden OPENSSL_armcap_P
#endif
.extern OPENSSL_armcap_P
.hidden OPENSSL_armcap_P
#endif
@@
-187,11
+187,13
@@
$code.=<<___;
.type sha1_block_data_order,%function
.align 6
sha1_block_data_order:
.type sha1_block_data_order,%function
.align 6
sha1_block_data_order:
+ AARCH64_VALID_CALL_TARGET
adrp x16,OPENSSL_armcap_P
ldr w16,[x16,#:lo12:OPENSSL_armcap_P]
tst w16,#ARMV8_SHA1
b.ne .Lv8_entry
adrp x16,OPENSSL_armcap_P
ldr w16,[x16,#:lo12:OPENSSL_armcap_P]
tst w16,#ARMV8_SHA1
b.ne .Lv8_entry
+ // Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
stp x29,x30,[sp,#-96]!
add x29,sp,#0
stp x19,x20,[sp,#16]
stp x29,x30,[sp,#-96]!
add x29,sp,#0
stp x19,x20,[sp,#16]
@@
-253,6
+255,7
@@
$code.=<<___;
.align 6
sha1_block_armv8:
.Lv8_entry:
.align 6
sha1_block_armv8:
.Lv8_entry:
+ // Armv8.3-A PAuth: even though x30 is pushed to stack it is not popped later.
stp x29,x30,[sp,#-16]!
add x29,sp,#0
stp x29,x30,[sp,#-16]!
add x29,sp,#0