Show More
@@ -277,7 +277,7 b' class http2handler(urllib2.HTTPHandler, ' | |||
|
277 | 277 | kwargs.update(sslutil.sslkwargs(self.ui, host)) |
|
278 | 278 | |
|
279 | 279 | con = HTTPConnection(host, port, use_ssl=True, |
|
280 |
ssl_wrap_socket=sslutil. |
|
|
280 | ssl_wrap_socket=sslutil.wrapsocket, | |
|
281 | 281 | ssl_validator=sslutil.validator(self.ui, host), |
|
282 | 282 | **kwargs) |
|
283 | 283 | return con |
@@ -45,8 +45,8 b' class STARTTLS(smtplib.SMTP):' | |||
|
45 | 45 | raise smtplib.SMTPException(msg) |
|
46 | 46 | (resp, reply) = self.docmd("STARTTLS") |
|
47 | 47 | if resp == 220: |
|
48 |
self.sock = sslutil. |
|
|
49 |
|
|
|
48 | self.sock = sslutil.wrapsocket(self.sock, keyfile, certfile, | |
|
49 | **self._sslkwargs) | |
|
50 | 50 | if not util.safehasattr(self.sock, "read"): |
|
51 | 51 | # using httplib.FakeSocket with Python 2.5.x or earlier |
|
52 | 52 | self.sock.read = self.sock.recv |
@@ -74,9 +74,9 b" if util.safehasattr(smtplib.SMTP, '_get_" | |||
|
74 | 74 | if self.debuglevel > 0: |
|
75 | 75 | print >> sys.stderr, 'connect:', (host, port) |
|
76 | 76 | new_socket = socket.create_connection((host, port), timeout) |
|
77 |
new_socket = sslutil. |
|
|
78 |
|
|
|
79 |
|
|
|
77 | new_socket = sslutil.wrapsocket(new_socket, | |
|
78 | self.keyfile, self.certfile, | |
|
79 | **self._sslkwargs) | |
|
80 | 80 | self.file = smtplib.SSLFakeFile(new_socket) |
|
81 | 81 | return new_socket |
|
82 | 82 | else: |
@@ -21,9 +21,9 b' try:' | |||
|
21 | 21 | _canloaddefaultcerts = util.safehasattr(ssl_context, |
|
22 | 22 | 'load_default_certs') |
|
23 | 23 | |
|
24 |
def |
|
|
25 |
|
|
|
26 |
|
|
|
24 | def wrapsocket(sock, keyfile, certfile, ui, | |
|
25 | cert_reqs=ssl.CERT_NONE, | |
|
26 | ca_certs=None, serverhostname=None): | |
|
27 | 27 | # Allow any version of SSL starting with TLSv1 and |
|
28 | 28 | # up. Note that specifying TLSv1 here prohibits use of |
|
29 | 29 | # newer standards (like TLSv1_2), so this is the right way |
@@ -55,9 +55,9 b' try:' | |||
|
55 | 55 | raise util.Abort(_('ssl connection failed')) |
|
56 | 56 | return sslsocket |
|
57 | 57 | except AttributeError: |
|
58 |
def |
|
|
59 |
|
|
|
60 |
|
|
|
58 | def wrapsocket(sock, keyfile, certfile, ui, | |
|
59 | cert_reqs=ssl.CERT_NONE, | |
|
60 | ca_certs=None, serverhostname=None): | |
|
61 | 61 | sslsocket = ssl.wrap_socket(sock, keyfile, certfile, |
|
62 | 62 | cert_reqs=cert_reqs, ca_certs=ca_certs, |
|
63 | 63 | ssl_version=ssl.PROTOCOL_TLSv1) |
@@ -72,9 +72,9 b' except ImportError:' | |||
|
72 | 72 | |
|
73 | 73 | import socket, httplib |
|
74 | 74 | |
|
75 |
def |
|
|
76 |
|
|
|
77 |
|
|
|
75 | def wrapsocket(sock, keyfile, certfile, ui, | |
|
76 | cert_reqs=CERT_REQUIRED, | |
|
77 | ca_certs=None, serverhostname=None): | |
|
78 | 78 | if not util.safehasattr(socket, 'ssl'): |
|
79 | 79 | raise util.Abort(_('Python SSL support not found')) |
|
80 | 80 | if ca_certs: |
@@ -175,8 +175,8 b' class httpconnection(keepalive.HTTPConne' | |||
|
175 | 175 | self.sock.connect((self.host, self.port)) |
|
176 | 176 | if _generic_proxytunnel(self): |
|
177 | 177 | # we do not support client X.509 certificates |
|
178 |
self.sock = sslutil. |
|
|
179 |
|
|
|
178 | self.sock = sslutil.wrapsocket(self.sock, None, None, None, | |
|
179 | serverhostname=self.host) | |
|
180 | 180 | else: |
|
181 | 181 | keepalive.HTTPConnection.connect(self) |
|
182 | 182 | |
@@ -338,7 +338,7 b' if has_https:' | |||
|
338 | 338 | if self.realhostport: # use CONNECT proxy |
|
339 | 339 | _generic_proxytunnel(self) |
|
340 | 340 | host = self.realhostport.rsplit(':', 1)[0] |
|
341 |
self.sock = sslutil. |
|
|
341 | self.sock = sslutil.wrapsocket( | |
|
342 | 342 | self.sock, self.key_file, self.cert_file, serverhostname=host, |
|
343 | 343 | **sslutil.sslkwargs(self.ui, host)) |
|
344 | 344 | sslutil.validator(self.ui, host)(self.sock) |
General Comments 0
You need to be logged in to leave comments.
Login now