From: Benjamin Peterson <benjamin@python.org>
Date: Wed, 12 Mar 2014 23:05:53 +0000 (-0500)
Subject: use ssl.PROTOCOL_SSLv23 for maximum compatibility (closes #20896)
X-Git-Tag: 3.1~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c8cae16008cecfeafa1ce3bcea76e7db3bb269c;p=thirdparty%2FPython%2Fcpython.git

use ssl.PROTOCOL_SSLv23 for maximum compatibility (closes #20896)
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index f2f4f80fc69b..7d56b8fba533 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -195,12 +195,15 @@ class NetworkedTests(unittest.TestCase):
 
     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 @@ class NetworkedTests(unittest.TestCase):
             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: