Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove additional endbr64 patch, add tests for macos-11 #949

Merged
merged 1 commit into from
Nov 18, 2023
Merged

remove additional endbr64 patch, add tests for macos-11 #949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
20 changes: 20 additions & 0 deletions patches/asm/0005-Revert-aesni-endbr64.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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