diff options
| author | Barry Warsaw <barry@python.org> | 2011-10-28 20:14:44 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2011-10-28 20:14:44 (GMT) |
| commit | be83698f21eabb1e787a56051a5acd5600d19e6d (patch) | |
| tree | 74978a2f6b1716eeaad828ff3606e23052142ebf /Lib/test/test_ssl.py | |
| parent | 87033526adba2f29319df133ec92a3cd23f4c704 (diff) | |
| download | cpython-be83698f21eabb1e787a56051a5acd5600d19e6d.zip cpython-be83698f21eabb1e787a56051a5acd5600d19e6d.tar.gz cpython-be83698f21eabb1e787a56051a5acd5600d19e6d.tar.bz2 | |
- Issue #13218: Fix test_ssl failures on Debian/Ubuntu.
Diffstat (limited to 'Lib/test/test_ssl.py')
| -rw-r--r-- | Lib/test/test_ssl.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index aa6c850..0eb508d 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -1025,7 +1025,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) @skip_if_broken_ubuntu_ssl @@ -1039,7 +1040,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.""" |