From 38659aca53feb7bffa39d7daf6bf29d69323e9c7 Mon Sep 17 00:00:00 2001 From: Kashif Khan Date: Mon, 23 Sep 2024 17:27:42 -0500 Subject: [PATCH] support openssl3 linking --- pyproject.toml | 4 ++-- utils/install_openssl.sh | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 8a33bf4a..a05043eb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,5 +27,5 @@ CFLAGS = "-mmacosx-version-min=10.9 -I/tmp/openssl/include" [tool.cibuildwheel.linux] archs = ["x86_64"] manylinux-x86_64-image = "manylinux2014" -before-build = ["yum -y install perl-IPC-Cmd openssl-devel","bash utils/install_openssl.sh"] -environment = {OPENSSL_ROOT_DIR="/opt/pyca/cryptography/openssl", LIBRARY_PATH="/opt/pyca/cryptography/openssl/lib", CPATH="/opt/pyca/cryptography/openssl/include", CFLAGS="-Wno-error=incompatible-pointer-types -Wunused-function"} \ No newline at end of file +before-build = ["yum -y install perl-IPC-Cmd","bash utils/install_openssl.sh"] +environment = {OPENSSL_ROOT_DIR="/opt/pyca/cryptography/openssl", LD_LIBRARY_PATH="/opt/pyca/cryptography/openssl/lib64", LIBRARY_PATH="/opt/pyca/cryptography/openssl/lib64", CPATH="/opt/pyca/cryptography/openssl/include", CFLAGS="-Wno-error=incompatible-pointer-types -Wunused-function"} \ No newline at end of file diff --git a/utils/install_openssl.sh b/utils/install_openssl.sh index a039b530..bb0ee280 100644 --- a/utils/install_openssl.sh +++ b/utils/install_openssl.sh @@ -3,8 +3,8 @@ set -xe OPENSSL_URL="https://github.com/openssl/openssl/releases/download/" -export OPENSSL_VERSION="openssl-3.2.3" -export OPENSSL_SHA256=" 52b5f1c6b8022bc5868c308c54fb77705e702d6c6f4594f99a0df216acf46239" +export OPENSSL_VERSION="openssl-3.0.15" +export OPENSSL_SHA256=" 23c666d0edf20f14249b3d8f0368acaee9ab585b09e1de82107c66e1f3ec9533" # We need a base set of flags because on Windows using MSVC # enable-ec_nistp_64_gcc_128 doesn't work since there's no 128-bit type export OPENSSL_BUILD_FLAGS_WINDOWS="no-ssl3 no-ssl3-method no-zlib no-shared no-comp no-dynamic-engine" @@ -19,6 +19,7 @@ function check_sha256sum { } curl -#LO "${OPENSSL_URL}/${OPENSSL_VERSION}/${OPENSSL_VERSION}.tar.gz" +yum -y remove openssl openssl-devel check_sha256sum ${OPENSSL_VERSION}.tar.gz ${OPENSSL_SHA256} tar zxf ${OPENSSL_VERSION}.tar.gz PATH=/opt/perl/bin:$PATH