summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIllia Volochii <illia.volochii@gmail.com>2022-12-24 02:04:20 (GMT)
committerGitHub <noreply@github.com>2022-12-24 02:04:20 (GMT)
commita23cb72ac82372fac05ba36ce08923840ca0de06 (patch)
tree05b68841541057e3db99231701cafe4bf3cba97c
parent7ca45e5ddd493411e61706d07679ea54b954e41b (diff)
downloadcpython-a23cb72ac82372fac05ba36ce08923840ca0de06.zip
cpython-a23cb72ac82372fac05ba36ce08923840ca0de06.tar.gz
cpython-a23cb72ac82372fac05ba36ce08923840ca0de06.tar.bz2
gh-100454: Start running SSL tests with OpenSSL 3.1.0-beta1 (#100456)
-rw-r--r--.github/workflows/build.yml2
-rw-r--r--Misc/NEWS.d/next/Tests/2022-12-23-13-29-55.gh-issue-100454.3no0cW.rst1
-rwxr-xr-xTools/ssl/multissltests.py8
3 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a1bdfa0..f798992 100644
--- 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
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 30d6696..5ad597c 100755
--- 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(