(original) (raw)

changeset: 73175:3c225f938dae branch: 2.7 parent: 73162:9a6699a8aee9 user: Barry Warsaw barry@python.org date: Fri Oct 28 16:14:44 2011 -0400 files: Lib/test/test_ssl.py Misc/NEWS description: - Issue #13218: Fix test_ssl failures on Debian/Ubuntu. diff -r 9a6699a8aee9 -r 3c225f938dae Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py Fri Oct 28 14:20:08 2011 +0300 +++ b/Lib/test/test_ssl.py Fri Oct 28 16:14:44 2011 -0400 @@ -1025,7 +1025,8 @@ try_protocol_combo(ssl.PROTOCOL_SSLv3, ssl.PROTOCOL_SSLv3, True, ssl.CERT_REQUIRED) if hasattr(ssl, 'PROTOCOL_SSLv2'): 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) @skip_if_broken_ubuntu_ssl @@ -1039,7 +1040,8 @@ if hasattr(ssl, 'PROTOCOL_SSLv2'): 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_SSLv23, False) + try_protocol_combo(ssl.PROTOCOL_TLSv1, ssl.PROTOCOL_SSLv23, False, + client_options=ssl.OP_NO_TLSv1) def test_starttls(self): """Switching from clear text to encrypted and back again.""" diff -r 9a6699a8aee9 -r 3c225f938dae Misc/NEWS --- a/Misc/NEWS Fri Oct 28 14:20:08 2011 +0300 +++ b/Misc/NEWS Fri Oct 28 16:14:44 2011 -0400 @@ -9,6 +9,8 @@ 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 #13018: Fix reference leaks in error paths in dictobject.c. /barry@python.org