diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2020-05-16 08:33:42 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-16 08:33:42 (GMT) |
| commit | a669443dfb79fc6aca2544b885895814798db15b (patch) | |
| tree | ee5351f9259d1f6be2f2ae6113d10c6d919a4004 /Tools/ssl | |
| parent | c3d025a86a60348f19551bd9921304c5db322531 (diff) | |
| download | cpython-a669443dfb79fc6aca2544b885895814798db15b.zip cpython-a669443dfb79fc6aca2544b885895814798db15b.tar.gz cpython-a669443dfb79fc6aca2544b885895814798db15b.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
(cherry picked from commit 6e8cda91d92da72800d891b2fc2073ecbc134d98)
Co-authored-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Tools/ssl')
| -rwxr-xr-x | Tools/ssl/multissltests.py | 9 |
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', |