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

[ambv]

https://github.com/python/cpython/commit/7a6178a7cd8514911e9480f826838dc789fb8655
commit: 7a6178a7cd8514911e9480f826838dc789fb8655
branch: 3.9
author: Łukasz Langa <lukasz at langa.pl>
committer: ambv <lukasz at langa.pl>
date: 2021-09-08T19:01:25+02:00
summary:

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

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

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

files:
M .github/workflows/build.yml
M Tools/ssl/multissltests.py

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9f06fd33cc07e8..bb56a42a5e3401 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 6baec7bc31a581..8888c4a6e5850b 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -50,7 +50,7 @@
 
 OPENSSL_RECENT_VERSIONS = [
     "1.1.1l",
-    "3.0.0-beta1"
+    "3.0.0"
 ]
 
 LIBRESSL_OLD_VERSIONS = [
@@ -410,6 +410,10 @@ def _post_install_300(self):
             ["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):