diff options
| author | Barry Warsaw <barry@python.org> | 2011-10-28 20:52:17 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2011-10-28 20:52:17 (GMT) |
| commit | 46ae0efce1128b4d5793981c133c21a5176401e1 (patch) | |
| tree | c9a670adf8882d997d177335755ae592765ac0e1 | |
| parent | 4d46c2a7229eee963180a938c914bee3352a016f (diff) | |
| download | cpython-46ae0efce1128b4d5793981c133c21a5176401e1.zip cpython-46ae0efce1128b4d5793981c133c21a5176401e1.tar.gz cpython-46ae0efce1128b4d5793981c133c21a5176401e1.tar.bz2 | |
- Issue #13218: Fix test_ssl failures on Debian/Ubuntu.
| -rw-r--r-- | Lib/test/test_ssl.py | 6 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index a79fce6..f942d95 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1315,7 +1315,8 @@ else: 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) if no_sslv2_implies_sslv3_hello(): # No SSLv2 => client will use an SSLv3 hello on recent OpenSSLs @@ -1333,7 +1334,8 @@ else: 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.""" @@ -171,6 +171,8 @@ Library Tests ----- +- Issue #13218: Fix test_ssl failures on Debian/Ubuntu. + - Issue #12821: Fix test_fcntl failures on OpenBSD 5. - Re-enable lib2to3's test_parser.py tests, though with an expected failure |