Land #949

libressl · Nov 18, 2023 · 0358e76 · 0358e76
2 parents 746944b + 4cce395
commit 0358e76
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ["macos-13", "macos-12"]
+        os: ["macos-13", "macos-12", "macos-11"]
         arch: ["arm64", "x86_64"]
     steps:
     - name: "Install required packages"

diff --git a/patches/asm/0005-Revert-aesni-endbr64.patch b/patches/asm/0005-Revert-aesni-endbr64.patch
@@ -0,0 +1,20 @@
+commit ac992937b461479b41f7f65e79646ef0a715f95d
+Author: Brent Cook <[email protected]>
+Date:   Thu Nov 9 12:29:33 2023 -0600
+
+    Revert "aesni_ctr32_encrypt_blocks() is called indirectly from C code, so it"
+
+    This reverts commit 52f96c842e82486510ffc2513e71323b70242f28.
+
+diff --git a/src/lib/libcrypto/aes/asm/aesni-x86_64.pl b/src/lib/libcrypto/aes/asm/aesni-x86_64.pl
+index 07d40a84a..c261a3795 100644
+--- a/src/lib/libcrypto/aes/asm/aesni-x86_64.pl
++++ b/src/lib/libcrypto/aes/asm/aesni-x86_64.pl
+@@ -1025,7 +1025,6 @@ $code.=<<___;
+ .type	aesni_ctr32_encrypt_blocks,\@function,5
+ .align	16
+ aesni_ctr32_encrypt_blocks:
+-	endbr64
+ 	lea	(%rsp),%rax
+ 	push	%rbp
+ 	sub	\$$frame_size,%rsp