aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/tcp.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-05-15 14:15:33 +0200
committerMaximilian Hils <git@maximilianhils.com>2014-05-15 14:15:33 +0200
commit71834aeab144d8bf083785f668989ad3fb21554e (patch)
tree4d93523eb9798cde8709c7da0df803eb5302f058 /netlib/tcp.py
parenta8345af282692a7faf859b37f2748705091004fe (diff)
downloadmitmproxy-71834aeab144d8bf083785f668989ad3fb21554e.tar.gz
mitmproxy-71834aeab144d8bf083785f668989ad3fb21554e.tar.bz2
mitmproxy-71834aeab144d8bf083785f668989ad3fb21554e.zip
make cert and key mandatory
Diffstat (limited to 'netlib/tcp.py')
-rw-r--r--netlib/tcp.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py
index 7b05222f..e72d5e48 100644
--- a/netlib/tcp.py
+++ b/netlib/tcp.py
@@ -391,12 +391,12 @@ class BaseHandler(_Connection):
ctx.set_verify(SSL.VERIFY_PEER, ver)
return ctx
- def convert_to_ssl(self, **kwargs):
+ def convert_to_ssl(self, cert, key, **sslctx_kwargs):
"""
Convert connection to SSL.
For a list of parameters, see BaseHandler._create_ssl_context(...)
"""
- ctx = self._create_ssl_context(**kwargs)
+ ctx = self._create_ssl_context(cert, key, **sslctx_kwargs)
self.connection = SSL.Connection(ctx, self.connection)
self.ssl_established = True
self.connection.set_accept_state()