diff options
| author | deraadt <> | 2023-04-25 04:42:26 +0000 |
|---|---|---|
| committer | deraadt <> | 2023-04-25 04:42:26 +0000 |
| commit | e2118101444d3cf3cab87297b363cecd5357ae89 (patch) | |
| tree | b4ae043f669d9d718f1fecb4ca705a0cf2d2ddc7 /src/lib/libcrypto/sha | |
| parent | c6490b97c04798e5cd36a489e3ba5ffc4a66550b (diff) | |
| download | openbsd-e2118101444d3cf3cab87297b363cecd5357ae89.tar.gz openbsd-e2118101444d3cf3cab87297b363cecd5357ae89.tar.bz2 openbsd-e2118101444d3cf3cab87297b363cecd5357ae89.zip | |
Add endbr64 where needed by inspection. Passes regresson tests.
ok jsing, and kind of tb an earlier version
Diffstat (limited to 'src/lib/libcrypto/sha')
| -rwxr-xr-x | src/lib/libcrypto/sha/asm/sha1-x86_64.pl | 4 | ||||
| -rwxr-xr-x | src/lib/libcrypto/sha/asm/sha512-x86_64.pl | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/lib/libcrypto/sha/asm/sha1-x86_64.pl b/src/lib/libcrypto/sha/asm/sha1-x86_64.pl index 43eee73c4a..e15ff47f88 100755 --- a/src/lib/libcrypto/sha/asm/sha1-x86_64.pl +++ b/src/lib/libcrypto/sha/asm/sha1-x86_64.pl | |||
| @@ -222,6 +222,7 @@ $code.=<<___; | |||
| 222 | .type sha1_block_data_order,\@function,3 | 222 | .type sha1_block_data_order,\@function,3 |
| 223 | .align 16 | 223 | .align 16 |
| 224 | sha1_block_data_order: | 224 | sha1_block_data_order: |
| 225 | endbr64 | ||
| 225 | mov OPENSSL_ia32cap_P+0(%rip),%r9d | 226 | mov OPENSSL_ia32cap_P+0(%rip),%r9d |
| 226 | mov OPENSSL_ia32cap_P+4(%rip),%r8d | 227 | mov OPENSSL_ia32cap_P+4(%rip),%r8d |
| 227 | test \$IA32CAP_MASK1_SSSE3,%r8d # check SSSE3 bit | 228 | test \$IA32CAP_MASK1_SSSE3,%r8d # check SSSE3 bit |
| @@ -309,6 +310,7 @@ $code.=<<___; | |||
| 309 | .align 16 | 310 | .align 16 |
| 310 | sha1_block_data_order_ssse3: | 311 | sha1_block_data_order_ssse3: |
| 311 | _ssse3_shortcut: | 312 | _ssse3_shortcut: |
| 313 | endbr64 | ||
| 312 | push %rbx | 314 | push %rbx |
| 313 | push %rbp | 315 | push %rbp |
| 314 | push %r12 | 316 | push %r12 |
| @@ -729,6 +731,7 @@ $code.=<<___; | |||
| 729 | .align 16 | 731 | .align 16 |
| 730 | sha1_block_data_order_avx: | 732 | sha1_block_data_order_avx: |
| 731 | _avx_shortcut: | 733 | _avx_shortcut: |
| 734 | endbr64 | ||
| 732 | push %rbx | 735 | push %rbx |
| 733 | push %rbp | 736 | push %rbp |
| 734 | push %r12 | 737 | push %r12 |
| @@ -1099,6 +1102,7 @@ $code.=<<___; | |||
| 1099 | .type se_handler,\@abi-omnipotent | 1102 | .type se_handler,\@abi-omnipotent |
| 1100 | .align 16 | 1103 | .align 16 |
| 1101 | se_handler: | 1104 | se_handler: |
| 1105 | endbr64 | ||
| 1102 | push %rsi | 1106 | push %rsi |
| 1103 | push %rdi | 1107 | push %rdi |
| 1104 | push %rbx | 1108 | push %rbx |
diff --git a/src/lib/libcrypto/sha/asm/sha512-x86_64.pl b/src/lib/libcrypto/sha/asm/sha512-x86_64.pl index 0517eab660..120693feeb 100755 --- a/src/lib/libcrypto/sha/asm/sha512-x86_64.pl +++ b/src/lib/libcrypto/sha/asm/sha512-x86_64.pl | |||
| @@ -175,6 +175,7 @@ $code=<<___; | |||
| 175 | .type $func,\@function,4 | 175 | .type $func,\@function,4 |
| 176 | .align 16 | 176 | .align 16 |
| 177 | $func: | 177 | $func: |
| 178 | endbr64 | ||
| 178 | push %rbx | 179 | push %rbx |
| 179 | push %rbp | 180 | push %rbp |
| 180 | push %r12 | 181 | push %r12 |
