diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2013-08-12 16:03:29 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2013-08-12 16:03:29 +1200 |
| commit | 62edceee093dd54956ed5b623dfb4cb8c1309a16 (patch) | |
| tree | 5ccb3ad51edeca77c7f4ad5f9ea1c237177744ff /netlib/tcp.py | |
| parent | 2da57ecff0e9572e45663dbad1c5f520e57c531f (diff) | |
| download | mitmproxy-62edceee093dd54956ed5b623dfb4cb8c1309a16.tar.gz mitmproxy-62edceee093dd54956ed5b623dfb4cb8c1309a16.tar.bz2 mitmproxy-62edceee093dd54956ed5b623dfb4cb8c1309a16.zip | |
Revamp dummy cert generation.
We no longer use on-disk storage - we just keep the certs in memory.
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index f4a8acf9..31e9a398 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -268,6 +268,7 @@ class BaseHandler: def convert_to_ssl(self, cert, key, method=SSLv23_METHOD, options=None, handle_sni=None, request_client_cert=False): """ + cert: A certutils.SSLCert object. method: One of SSLv2_METHOD, SSLv3_METHOD, SSLv23_METHOD, or TLSv1_METHOD handle_sni: SNI handler, should take a connection object. Server name can be retrieved like this: @@ -297,7 +298,7 @@ class BaseHandler: # SNI callback happens during do_handshake() ctx.set_tlsext_servername_callback(handle_sni) ctx.use_privatekey_file(key) - ctx.use_certificate_file(cert) + ctx.use_certificate(cert.x509) if request_client_cert: def ver(*args): self.clientcert = certutils.SSLCert(args[1]) |