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.

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

Update OpenSSL to the latest stable version (3.3.0) #18

Merged
merged 1 commit into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ jobs:
fail-fast: false
matrix:
include:
- os: macos-latest
- os: macos-14
arch: arm64
- os: macos-latest
- os: macos-13
arch: x86_64
- os: ubuntu-latest
arch: aarch64
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-openssl.bat
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Buil
SET PATH=%PATH%;C:\Program Files\NASM

mkdir openssl
curl -L https://www.openssl.org/source/openssl-3.2.1.tar.gz -o openssl.tar.gz
curl -L https://www.openssl.org/source/openssl-3.3.0.tar.gz -o openssl.tar.gz
tar xzf openssl.tar.gz -C openssl --strip-components 1
cd openssl

Expand Down
8 changes: 1 addition & 7 deletions scripts/build-openssl.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,6 @@ def get_platform():
if system == "Linux":
return f"manylinux_{machine}"
elif system == "Darwin":
# cibuildwheel sets ARCHFLAGS:
# https://github.com/pypa/cibuildwheel/blob/5255155bc57eb6224354356df648dc42e31a0028/cibuildwheel/macos.py#L207-L220
if "ARCHFLAGS" in os.environ:
machine = os.environ["ARCHFLAGS"].split()[1]
return f"macosx_{machine}"
elif system == "Windows":
if struct.calcsize("P") * 8 == 64:
Expand Down Expand Up @@ -69,8 +65,6 @@ def run(cmd, *, env=None):
if platform.system() == "Linux" and os.environ.get("CIBUILDWHEEL") == "1":
output_dir = "/output"
run(["yum", "-y", "install", "perl-IPC-Cmd"])
elif platform.system() == "Darwin" and os.environ.get("ARCHFLAGS") == "-arch arm64":
configure_args = ["darwin64-arm64"]
output_tarball = os.path.join(output_dir, f"openssl-{get_platform()}.tar.gz")

for d in [build_dir, output_dir, source_dir]:
Expand All @@ -80,7 +74,7 @@ def run(cmd, *, env=None):
os.chdir(build_dir)

# build openssl
extract("openssl", "https://www.openssl.org/source/openssl-3.2.1.tar.gz")
extract("openssl", "https://www.openssl.org/source/openssl-3.3.0.tar.gz")
os.chdir("openssl")
run(["./config"] + configure_args + ["no-apps", "no-comp", "no-dso", "no-shared", "no-tests"])
run(["make"])
Expand Down
Loading