aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/workflows/macos.yml2
-rw-r--r--patches/asm/0005-Revert-aesni-endbr64.patch20
2 files changed, 21 insertions, 1 deletions
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index e813191..f8636ff 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -16,7 +16,7 @@ jobs:
16 strategy: 16 strategy:
17 fail-fast: false 17 fail-fast: false
18 matrix: 18 matrix:
19 os: ["macos-13", "macos-12"] 19 os: ["macos-13", "macos-12", "macos-11"]
20 arch: ["arm64", "x86_64"] 20 arch: ["arm64", "x86_64"]
21 steps: 21 steps:
22 - name: "Install required packages" 22 - name: "Install required packages"
diff --git a/patches/asm/0005-Revert-aesni-endbr64.patch b/patches/asm/0005-Revert-aesni-endbr64.patch
new file mode 100644
index 0000000..f2094e6
--- /dev/null
+++ b/patches/asm/0005-Revert-aesni-endbr64.patch
@@ -0,0 +1,20 @@
1commit ac992937b461479b41f7f65e79646ef0a715f95d
2Author: Brent Cook <busterb@gmail.com>
3Date: Thu Nov 9 12:29:33 2023 -0600
4
5 Revert "aesni_ctr32_encrypt_blocks() is called indirectly from C code, so it"
6
7 This reverts commit 52f96c842e82486510ffc2513e71323b70242f28.
8
9diff --git a/src/lib/libcrypto/aes/asm/aesni-x86_64.pl b/src/lib/libcrypto/aes/asm/aesni-x86_64.pl
10index 07d40a84a..c261a3795 100644
11--- a/src/lib/libcrypto/aes/asm/aesni-x86_64.pl
12+++ b/src/lib/libcrypto/aes/asm/aesni-x86_64.pl
13@@ -1025,7 +1025,6 @@ $code.=<<___;
14 .type aesni_ctr32_encrypt_blocks,\@function,5
15 .align 16
16 aesni_ctr32_encrypt_blocks:
17- endbr64
18 lea (%rsp),%rax
19 push %rbp
20 sub \$$frame_size,%rsp