[Python-checkins] Fixup from test_ssl test_default_ecdh_curve (GH-11877)

Victor Stinner webhook-mailer at python.org
Fri Feb 15 11:19:09 EST 2019


https://github.com/python/cpython/commit/28eb87f4f558952f259fada7be1ab5b31b8a91ef
commit: 28eb87f4f558952f259fada7be1ab5b31b8a91ef
branch: 2.7
author: stratakis <cstratak at redhat.com>
committer: Victor Stinner <vstinner at redhat.com>
date: 2019-02-15T17:18:58+01:00
summary:

Fixup from test_ssl test_default_ecdh_curve (GH-11877)

Partial backport from cb5b68abdeb1b1d56c581d5b4d647018703d61e3

Co-authored-by: Christian Heimes <christian at python.org>

files:
M Lib/test/test_ssl.py

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 00c83023f0b1..01e543241cfd 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -2860,6 +2860,9 @@ def test_default_ecdh_curve(self):
             # should be enabled by default on SSL contexts.
             context = ssl.SSLContext(ssl.PROTOCOL_SSLv23)
             context.load_cert_chain(CERTFILE)
+            # TLSv1.3 defaults to PFS key agreement and no longer has KEA in
+            # cipher name.
+            context.options |= ssl.OP_NO_TLSv1_3
             # Prior to OpenSSL 1.0.0, ECDH ciphers have to be enabled
             # explicitly using the 'ECCdraft' cipher alias.  Otherwise,
             # our default cipher list should prefer ECDH-based ciphers



More information about the Python-checkins mailing list