equal
deleted
inserted
replaced
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 |