Mercurial > hg

diff mercurial/httpclient/socketutil.py @ 19489:42fcb2f7787d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
httpclient: update to revision 9517a2b56fe9 of httpplus (issue3905) Includes upstream change "socketutil: force SSLv3 by default, as it is safer" which should fix issue 3905.
author Augie Fackler <raf@durin42.com>
date Wed, 24 Jul 2013 14:45:29 -0400
parents fae47ecaa952
children 59df9e52b5bb
line wrap: on
line diff
--- a/mercurial/httpclient/socketutil.py	Sat May 11 20:40:15 2013 -0500
+++ b/mercurial/httpclient/socketutil.py	Wed Jul 24 14:45:29 2013 -0400
@@ -106,7 +106,7 @@
                     else:
                         raise x
 
-    _PROTOCOL_SSLv23 = 2
+    _PROTOCOL_SSLv3 = 1
 
     CERT_NONE = 0
     CERT_OPTIONAL = 1
@@ -118,7 +118,7 @@
     # pylint: disable=W0613,R0913
     def wrap_socket(sock, keyfile=None, certfile=None,
                 server_side=False, cert_reqs=CERT_NONE,
-                ssl_version=_PROTOCOL_SSLv23, ca_certs=None,
+                ssl_version=_PROTOCOL_SSLv3, ca_certs=None,
                 do_handshake_on_connect=True,
                 suppress_ragged_eofs=True):
         """Backport of ssl.wrap_socket from Python 2.6."""