Skip to content

C
cpython
Kaydet (Commit) be83698f authored tarafından Barry Warsaw's avatar Barry Warsaw
Dosyalara gözat
Seçenekler

- Issue #13218: Fix test_ssl failures on Debian/Ubuntu.

üst 87033526
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
Lib/test/test_ssl.py
Dosyayı görüntüle @ be83698f
...@@ -1025,7 +1025,8 @@ else: ...@@ -1025,7 +1025,8 @@ else:
try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED) try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED)
if hasattr(ssl, 'PROTOCOL_SSLv2'): if hasattr(ssl, 'PROTOCOL_SSLv2'):
try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv2, False) try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv2, False)
try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, False) try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv23, False,
client_options=ssl.OP_NO_SSLv3)
try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_TLSv1, False) try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_TLSv1, False)
@skip_if_broken_ubuntu_ssl @skip_if_broken_ubuntu_ssl
...@@ -1039,7 +1040,8 @@ else: ...@@ -1039,7 +1040,8 @@ else:
if hasattr(ssl, 'PROTOCOL_SSLv2'): if hasattr(ssl, 'PROTOCOL_SSLv2'):
try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv2, False) try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv2, False)
try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv3, False) try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv3, False)
try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv23, False) try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv23, False,
client_options=ssl.OP_NO_TLSv1)
def test_starttls(self): def test_starttls(self):
"""Switching from clear text to encrypted and back again.""" """Switching from clear text to encrypted and back again."""
......
Misc/NEWS
Dosyayı görüntüle @ be83698f
...@@ -9,6 +9,8 @@ What's New in Python 2.7.3? ...@@ -9,6 +9,8 @@ What's New in Python 2.7.3?
Core and Builtins Core and Builtins
----------------- -----------------
- Issue #13218: Fix test_ssl failures on Debian/Ubuntu.
- Issue #13268: Fix the assert statement when a tuple is passed as the message. - Issue #13268: Fix the assert statement when a tuple is passed as the message.
- Issue #13018: Fix reference leaks in error paths in dictobject.c. - Issue #13018: Fix reference leaks in error paths in dictobject.c.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment