1. Carl Meyer
  2. pythonv


Barry Warsaw  committed 7a241bc Merge

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

  • Participants
  • Parent commits efd2863, 415e2c9
  • Branches 3.2

Comments (0)

Files changed (2)

File Lib/test/test_ssl.py

View file
             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
             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."""

File Misc/NEWS

View file
+- 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