[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 9f06fd33cc07e8bede8fc4fa2f2a441d47b60843..bb56a42a5e3401eadbf712ddf63f6018546bd2f9 100644 (file)
--- 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 6baec7bc31a5817d83ede7bc68a0583f13ceb3ae..8888c4a6e5850b8fba8d97999d4e37fc4d2e926f 100755 (executable)
--- 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):