equal
deleted
inserted
replaced
15 import ssl |
15 import ssl |
16 ssl_wrap_socket = ssl.wrap_socket |
16 ssl_wrap_socket = ssl.wrap_socket |
17 CERT_REQUIRED = ssl.CERT_REQUIRED |
17 CERT_REQUIRED = ssl.CERT_REQUIRED |
18 except ImportError: |
18 except ImportError: |
19 CERT_REQUIRED = 2 |
19 CERT_REQUIRED = 2 |
|
20 |
|
21 import socket, httplib |
20 |
22 |
21 def ssl_wrap_socket(sock, key_file, cert_file, |
23 def ssl_wrap_socket(sock, key_file, cert_file, |
22 cert_reqs=CERT_REQUIRED, ca_certs=None): |
24 cert_reqs=CERT_REQUIRED, ca_certs=None): |
23 if ca_certs: |
25 if ca_certs: |
24 raise util.Abort(_( |
26 raise util.Abort(_( |