diff options
| author | Christian Heimes <christian@python.org> | 2021-12-17 17:17:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-17 16:17:32 +0100 |
| commit | 2985feac4e02d590bb78bcce9e30864be53280ac (patch) | |
| tree | 540b9a585d18804970bc619dca26f648bf3a7ecb | |
| parent | efd6236d36b292c2c43540132c87cf8425e8d627 (diff) | |
| download | cpython-git-2985feac4e02d590bb78bcce9e30864be53280ac.tar.gz | |
bpo-46114: Fix OpenSSL version check for 3.0.1 (GH-30170)
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | Lib/test/test_ssl.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst | 1 | ||||
| -rwxr-xr-x | Tools/ssl/multissltests.py | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 48671aa7a6..4504b29432 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -220,7 +220,7 @@ jobs: strategy: fail-fast: false matrix: - openssl_ver: [1.1.1l, 3.0.0] + openssl_ver: [1.1.1l, 3.0.1] env: OPENSSL_VER: ${{ matrix.openssl_ver }} MULTISSL_DIR: ${{ github.workspace }}/multissl diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index 981e2fe82e..f99a3e8da9 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -540,7 +540,11 @@ class BasicSocketTests(unittest.TestCase): self.assertLessEqual(status, 15) libressl_ver = f"LibreSSL {major:d}" - openssl_ver = f"OpenSSL {major:d}.{minor:d}.{fix:d}" + if major >= 3: + # 3.x uses 0xMNN00PP0L + openssl_ver = f"OpenSSL {major:d}.{minor:d}.{patch:d}" + else: + openssl_ver = f"OpenSSL {major:d}.{minor:d}.{fix:d}" self.assertTrue( s.startswith((openssl_ver, libressl_ver)), (s, t, hex(n)) diff --git a/Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst b/Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst new file mode 100644 index 0000000000..6878cea032 --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-12-17-14-46-19.bpo-46114.9iyZ_9.rst @@ -0,0 +1 @@ +Fix test case for OpenSSL 3.0.1 version. OpenSSL 3.0 uses ``0xMNN00PP0L``. diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py index ba2663e9a3..8fe5b5d0c2 100755 --- a/Tools/ssl/multissltests.py +++ b/Tools/ssl/multissltests.py @@ -48,7 +48,7 @@ OPENSSL_OLD_VERSIONS = [ OPENSSL_RECENT_VERSIONS = [ "1.1.1l", - "3.0.0" + "3.0.1" ] LIBRESSL_OLD_VERSIONS = [ |