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

Thu Mar 13 00:11:16 CET 2014

http://hg.python.org/cpython/rev/789ca594960f
changeset: 89609:789ca594960f
branch: 3.2
parent: 89431:e82dcd700e8c
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
@@ -690,12 +690,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:
@@ -703,7 +706,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
