From: Gregory P. Smith <greg@krypto.org>
Date: Sat, 24 Dec 2022 20:12:04 +0000 (-0800)
Subject: [3.11] gh-100454: Start running SSL tests with OpenSSL 3.1.0-beta1 (#100486)
X-Git-Tag: v3.11.2~141
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=341bdd6589cf11b1d01e8928fde8c180e1a92b5a;p=thirdparty%2FPython%2Fcpython.git

[3.11] gh-100454: Start running SSL tests with OpenSSL 3.1.0-beta1 (#100486)

[3.11] gh-100454: Start running SSL tests with OpenSSL 3.1.0-beta1 (GH-100456).
(cherry picked from commit a23cb72ac82372fac05ba36ce08923840ca0de06)

Co-authored-by: Illia Volochii <illia.volochii@gmail.com>
---

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 328714e87714..5647d6b29b13 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -268,7 +268,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openssl_ver: [1.1.1q, 3.0.5]
+        openssl_ver: [1.1.1s, 3.0.7, 3.1.0-beta1]
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}
       MULTISSL_DIR: ${{ github.workspace }}/multissl
diff --git a/Misc/NEWS.d/next/Tests/2022-12-23-13-29-55.gh-issue-100454.3no0cW.rst b/Misc/NEWS.d/next/Tests/2022-12-23-13-29-55.gh-issue-100454.3no0cW.rst
new file mode 100644
index 000000000000..8b08ca0dcef7
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2022-12-23-13-29-55.gh-issue-100454.3no0cW.rst
@@ -0,0 +1 @@
+Start running SSL tests with OpenSSL 3.1.0-beta1.
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 91d6f558bc51..b1aacfa550f1 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -403,15 +403,15 @@ class BuildOpenSSL(AbstractBuilder):
     depend_target = 'depend'
 
     def _post_install(self):
-        if self.version.startswith("3.0"):
-            self._post_install_300()
+        if self.version.startswith("3."):
+            self._post_install_3xx()
 
     def _build_src(self, config_args=()):
-        if self.version.startswith("3.0"):
+        if self.version.startswith("3."):
             config_args += ("enable-fips",)
         super()._build_src(config_args)
 
-    def _post_install_300(self):
+    def _post_install_3xx(self):
         # create ssl/ subdir with example configs
         # Install FIPS module
         self._subprocess_call(