From: Łukasz Langa <lukasz@langa.pl>
Date: Wed, 8 Sep 2021 17:01:25 +0000 (+0200)
Subject: [3.9] bpo-38820: Test with OpenSSL 3.0.0 final (GH-28205) (GH-28217)
X-Git-Tag: v3.9.8~180
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a6178a7cd8514911e9480f826838dc789fb8655;p=thirdparty%2FPython%2Fcpython.git

[3.9] bpo-38820: Test with OpenSSL 3.0.0 final (GH-28205) (GH-28217)

Signed-off-by: Christian Heimes <christian@python.org>.
(cherry picked from commit cc7c6801945c6a7373553b78bd899ce09681ec0a)

Co-authored-by: Christian Heimes <christian@python.org>
---

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):