Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/sslutil.py @ 19749:f2871c30e6a7 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Augie Fackler <raf@durin42.com>
date Wed, 18 Sep 2013 14:40:17 -0400
parents 074bd02352c0
children 47ff9d1abfa9
comparison
equal deleted inserted replaced
19748:59df9e52b5bb 19749:f2871c30e6a7
15 import ssl 15 import ssl
16 CERT_REQUIRED = ssl.CERT_REQUIRED 16 CERT_REQUIRED = ssl.CERT_REQUIRED
17 def ssl_wrap_socket(sock, keyfile, certfile, 17 def ssl_wrap_socket(sock, keyfile, certfile,
18 cert_reqs=ssl.CERT_NONE, ca_certs=None): 18 cert_reqs=ssl.CERT_NONE, ca_certs=None):
19 sslsocket = ssl.wrap_socket(sock, keyfile, certfile, 19 sslsocket = ssl.wrap_socket(sock, keyfile, certfile,
20 cert_reqs=cert_reqs, ca_certs=ca_certs, 20 cert_reqs=cert_reqs, ca_certs=ca_certs)
21 ssl_version=ssl.PROTOCOL_SSLv3)
22 # check if wrap_socket failed silently because socket had been closed 21 # check if wrap_socket failed silently because socket had been closed
23 # - see http://bugs.python.org/issue13721 22 # - see http://bugs.python.org/issue13721
24 if not sslsocket.cipher(): 23 if not sslsocket.cipher():
25 raise util.Abort(_('ssl connection failed')) 24 raise util.Abort(_('ssl connection failed'))
26 return sslsocket 25 return sslsocket