summaryrefslogtreecommitdiff
path: root/Lib/test/test_ssl.py
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2021-12-17 17:17:32 +0200
committerGitHub <noreply@github.com>2021-12-17 16:17:32 +0100
commit2985feac4e02d590bb78bcce9e30864be53280ac (patch)
tree540b9a585d18804970bc619dca26f648bf3a7ecb /Lib/test/test_ssl.py
parentefd6236d36b292c2c43540132c87cf8425e8d627 (diff)
downloadcpython-git-2985feac4e02d590bb78bcce9e30864be53280ac.tar.gz
bpo-46114: Fix OpenSSL version check for 3.0.1 (GH-30170)
Diffstat (limited to 'Lib/test/test_ssl.py')
-rw-r--r--Lib/test/test_ssl.py6
1 files changed, 5 insertions, 1 deletions
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))