aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/tcp.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2014-03-05 13:43:52 +1300
committerAldo Cortesi <aldo@nullcube.com>2014-03-05 13:43:52 +1300
commit86730a9a4c3a14b510590aa97a8ae8989cb6ec5e (patch)
tree3b5aa620721f8be1548ac3571550a46d61694fac /netlib/tcp.py
parent0c3bc1cff2a8b1c4c425be5c1ca11c4b850bcc68 (diff)
downloadmitmproxy-86730a9a4c3a14b510590aa97a8ae8989cb6ec5e.tar.gz
mitmproxy-86730a9a4c3a14b510590aa97a8ae8989cb6ec5e.tar.bz2
mitmproxy-86730a9a4c3a14b510590aa97a8ae8989cb6ec5e.zip
Handler convert_to_ssl now takes a key object, not a path.
Diffstat (limited to 'netlib/tcp.py')
-rw-r--r--netlib/tcp.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py
index 0dff807b..83059bc2 100644
--- a/netlib/tcp.py
+++ b/netlib/tcp.py
@@ -375,7 +375,7 @@ class BaseHandler(_Connection):
if handle_sni:
# SNI callback happens during do_handshake()
ctx.set_tlsext_servername_callback(handle_sni)
- ctx.use_privatekey_file(key)
+ ctx.use_privatekey(key)
ctx.use_certificate(cert.x509)
if request_client_cert:
def ver(*args):