From 7f4324a4c68b26138275e823e5c9914858a38b00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Sat, 4 Nov 2023 21:22:21 +0100 Subject: [PATCH] Update OpenSSL to the latest stable version (3.1.4) --- scripts/build-openssl.bat | 2 +- scripts/build-openssl.py | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/build-openssl.bat b/scripts/build-openssl.bat index 5ba377b..5a3355b 100644 --- a/scripts/build-openssl.bat +++ b/scripts/build-openssl.bat @@ -21,7 +21,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliar SET PATH=%PATH%;C:\Program Files\NASM mkdir openssl -curl -L https://www.openssl.org/source/openssl-1.1.1m.tar.gz -o openssl.tar.gz +curl -L https://www.openssl.org/source/openssl-3.1.4.tar.gz -o openssl.tar.gz tar xzf openssl.tar.gz -C openssl --strip-components 1 cd openssl diff --git a/scripts/build-openssl.py b/scripts/build-openssl.py index 6134b4a..444ea31 100644 --- a/scripts/build-openssl.py +++ b/scripts/build-openssl.py @@ -64,12 +64,13 @@ def run(cmd, *, env=None): ) -configure_env = None +configure_args = [] output_dir = os.path.abspath("output") -if platform.system() == "Linux": +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_env = {"MACHINE": "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]: @@ -79,9 +80,9 @@ def run(cmd, *, env=None): os.chdir(build_dir) # build openssl - extract("openssl", "https://www.openssl.org/source/openssl-1.1.1m.tar.gz") + extract("openssl", "https://www.openssl.org/source/openssl-3.1.4.tar.gz") os.chdir("openssl") - run(["./config", "no-comp", "no-shared", "no-tests"], env=configure_env) + run(["./config"] + configure_args + ["no-comp", "no-shared", "no-tests"]) run(["make", "-j"]) run(["make", "install_sw", "INSTALLTOP=" + dest_dir, "LIBDIR=lib"])