[Python-checkins] cpython (3.1): use ssl.PROTOCOL_SSLv23 for maximum compatibility (closes #20896)

[benjamin.peterson]

http://hg.python.org/cpython/rev/23add5382fb3
changeset:   89608:23add5382fb3
branch:      3.1
parent:      89430:c25e1442529f
user:        Benjamin Peterson <benjamin at python.org>
date:        Wed Mar 12 18:05:53 2014 -0500
summary:
  use ssl.PROTOCOL_SSLv23 for maximum compatibility (closes #20896)

files:
  Lib/test/test_ssl.py |  11 ++++++++---
  1 files changed, 8 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -195,12 +195,15 @@
 
     def test_get_server_certificate(self):
         with support.transient_internet("svn.python.org"):
-            pem = ssl.get_server_certificate(("svn.python.org", 443))
+            pem = ssl.get_server_certificate(("svn.python.org", 443),
+                                             ssl.PROTOCOL_SSLv23)
             if not pem:
                 self.fail("No server certificate on svn.python.org:443!")
 
             try:
-                pem = ssl.get_server_certificate(("svn.python.org", 443), ca_certs=CERTFILE)
+                pem = ssl.get_server_certificate(("svn.python.org", 443),
+                                                 ssl.PROTOCOL_SSLv23,
+                                                 ca_certs=CERTFILE)
             except ssl.SSLError as x:
                 #should fail
                 if support.verbose:
@@ -208,7 +211,9 @@
             else:
                 self.fail("Got server certificate %s for svn.python.org!" % pem)
 
-            pem = ssl.get_server_certificate(("svn.python.org", 443), ca_certs=SVN_PYTHON_ORG_ROOT_CERT)
+            pem = ssl.get_server_certificate(("svn.python.org", 443),
+                                             ssl.PROTOCOL_SSLv23,
+                                             ca_certs=SVN_PYTHON_ORG_ROOT_CERT)
             if not pem:
                 self.fail("No server certificate on svn.python.org:443!")
             if support.verbose:

-- 
Repository URL: http://hg.python.org/cpython