Skip to content
Snippets Groups Projects
Commit 3b82d412 authored by durin42's avatar durin42
Browse files

sslutil: make keyfile and certfile arguments consistent between 2.6+ and 2.5-

parent c48df403
No related branches found
No related tags found
No related merge requests found
......@@ -34,7 +34,7 @@
import socket, httplib
def ssl_wrap_socket(sock, key_file, cert_file, ssl_version=PROTOCOL_TLSv1,
def ssl_wrap_socket(sock, keyfile, certfile, ssl_version=PROTOCOL_TLSv1,
cert_reqs=CERT_REQUIRED, ca_certs=None):
if not util.safehasattr(socket, 'ssl'):
raise util.Abort(_('Python SSL support not found'))
......@@ -42,7 +42,7 @@
raise util.Abort(_(
'certificate checking requires Python 2.6'))
ssl = socket.ssl(sock, key_file, cert_file)
ssl = socket.ssl(sock, keyfile, certfile)
return httplib.FakeSocket(sock, ssl)
def _verifycert(cert, hostname):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment