sslutil: backed out changeset 074bd02352c0 (issue4038) stable
authorAugie Fackler <raf@durin42.com>
Wed, 18 Sep 2013 14:40:17 -0400
branchstable
changeset 19749 f2871c30e6a7
parent 19748 59df9e52b5bb
child 19750 d4ed26beae0e
child 19751 478f3379768a
sslutil: backed out changeset 074bd02352c0 (issue4038) Python docs are a little unclear, but mpm reports reading the OpenSSL source code shows that PROTOCOL_SSLv23 allows TLS whereas PROTOCOL_SSLv3 does not.
mercurial/sslutil.py
--- a/mercurial/sslutil.py	Wed Sep 18 14:45:28 2013 -0400
+++ b/mercurial/sslutil.py	Wed Sep 18 14:40:17 2013 -0400
@@ -17,8 +17,7 @@
     def ssl_wrap_socket(sock, keyfile, certfile,
                 cert_reqs=ssl.CERT_NONE, ca_certs=None):
         sslsocket = ssl.wrap_socket(sock, keyfile, certfile,
-                cert_reqs=cert_reqs, ca_certs=ca_certs,
-                ssl_version=ssl.PROTOCOL_SSLv3)
+                cert_reqs=cert_reqs, ca_certs=ca_certs)
         # check if wrap_socket failed silently because socket had been closed
         # - see http://bugs.python.org/issue13721
         if not sslsocket.cipher():