diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-12-17 07:38:11 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-17 07:38:11 -0800 |
| commit | 251d2eadc7f5b4042245709f41c38169a284e146 (patch) | |
| tree | 6cd8629c5546fcca0734604cb5c7eeb03c56675f /Lib/test/test_ssl.py | |
| parent | 87539cc716fab47cd4f501f2441c4ab8e80bce6f (diff) | |
| download | cpython-git-251d2eadc7f5b4042245709f41c38169a284e146.tar.gz | |
bpo-46114: Fix OpenSSL version check for 3.0.1 (GH-30170)
(cherry picked from commit 2985feac4e02d590bb78bcce9e30864be53280ac)
Co-authored-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Lib/test/test_ssl.py')
| -rw-r--r-- | Lib/test/test_ssl.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index a485f7d4c3..873db6403d 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -539,7 +539,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)) |