gh-100454: Start running SSL tests with OpenSSL 3.1.0-beta1 (#100456)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a1bdfa0681e00f174390b7f63578956a50c2f1d2..f798992d8af61c8e37a43d49031b0ccef67236b7 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -235,7 +235,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        openssl_ver: [1.1.1s, 3.0.7]
+        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 (file)
index 0000000..8b08ca0
--- /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 30d66964fd1dcf0dcaf1e3012973b5fb3ffee7a3..5ad597c8347e568615ac764fef559da369a09f48 100755 (executable)
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -402,15 +402,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(