summaryrefslogtreecommitdiffstats
path: root/Tools
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2020-05-16 01:33:05 (GMT)
committerGitHub <noreply@github.com>2020-05-16 01:33:05 (GMT)
commit6e8cda91d92da72800d891b2fc2073ecbc134d98 (patch)
tree501dd9349f86747647e424002fa68605ebf598a8 /Tools
parent6b6092f533f0e4787b8564c4fad6ec6d1018af0d (diff)
downloadcpython-6e8cda91d92da72800d891b2fc2073ecbc134d98.zip
cpython-6e8cda91d92da72800d891b2fc2073ecbc134d98.tar.gz
cpython-6e8cda91d92da72800d891b2fc2073ecbc134d98.tar.bz2
bpo-40457: Support OpenSSL without TLS 1.0/1.1 (GH-19862)
OpenSSL can be build without support for TLS 1.0 and 1.1. The ssl module now correctly adheres to OPENSSL_NO_TLS1 and OPENSSL_NO_TLS1_1 flags. Also update multissltest to test with latest OpenSSL and LibreSSL releases. Signed-off-by: Christian Heimes <christian@python.org> Automerge-Triggered-By: @tiran
Diffstat (limited to 'Tools')
-rwxr-xr-xTools/ssl/multissltests.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/Tools/ssl/multissltests.py b/Tools/ssl/multissltests.py
index 0e37ec1..12af98d 100755
--- a/Tools/ssl/multissltests.py
+++ b/Tools/ssl/multissltests.py
@@ -43,20 +43,21 @@ import tarfile
log = logging.getLogger("multissl")
OPENSSL_OLD_VERSIONS = [
+ "1.0.2u",
+ "1.1.0l",
]
OPENSSL_RECENT_VERSIONS = [
- "1.0.2u",
- "1.1.0l",
"1.1.1g",
# "3.0.0-alpha2"
]
LIBRESSL_OLD_VERSIONS = [
+ "2.9.2",
]
LIBRESSL_RECENT_VERSIONS = [
- "2.9.2",
+ "3.1.0",
]
# store files in ../multissl
@@ -80,7 +81,7 @@ parser.add_argument(
parser.add_argument(
'--disable-ancient',
action='store_true',
- help="Don't test OpenSSL < 1.0.2 and LibreSSL < 2.5.3.",
+ help="Don't test OpenSSL and LibreSSL versions without upstream support",
)
parser.add_argument(
'--openssl',