From 7a6178a7cd8514911e9480f826838dc789fb8655 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=81ukasz=20Langa?= Date: Wed, 8 Sep 2021 19:01:25 +0200 Subject: [PATCH] [3.9] bpo-38820: Test with OpenSSL 3.0.0 final (GH-28205) (GH-28217) Signed-off-by: Christian Heimes . (cherry picked from commit cc7c6801945c6a7373553b78bd899ce09681ec0a) Co-authored-by: Christian Heimes --- .github/workflows/build.yml | 2 +- Tools/ssl/multissltests.py | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f06fd33cc07..bb56a42a5e34 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -196,7 +196,7 @@ jobs: strategy: fail-fast: false matrix: - openssl_ver: [1.0.2u, 1.1.0l, 1.1.1l, 3.0.0-beta1] + openssl_ver: [1.0.2u, 1.1.0l, 1.1.1l, 3.0.0] env: OPENSSL_VER: ${{ matrix.openssl_ver }} MULTISSL_DIR: ${{ github.workspace }}/multissl diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py index 6baec7bc31a5..8888c4a6e585 100755 --- a/Tools/ssl/multissltests.py +++ b/Tools/ssl/multissltests.py @@ -50,7 +50,7 @@ OPENSSL_OLD_VERSIONS = [ OPENSSL_RECENT_VERSIONS = [ "1.1.1l", - "3.0.0-beta1" + "3.0.0" ] LIBRESSL_OLD_VERSIONS = [ @@ -410,6 +410,10 @@ class BuildOpenSSL(AbstractBuilder): ["make", "-j1", "install_ssldirs", "install_fips"], cwd=self.build_dir ) + if not os.path.isdir(self.lib_dir): + # 3.0.0-beta2 uses lib64 on 64 bit platforms + lib64 = self.lib_dir + "64" + os.symlink(lib64, self.lib_dir) @property def short_version(self): -- 2.47.3