diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-02-21 15:13:18 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2017-02-21 20:57:29 +0100 |
| commit | 6b2383a9d8b3f170adba98b384dcc4b29acd0ddf (patch) | |
| tree | 8726e75816e7576e5f0242ef94d3b72835098d7d | |
| parent | 48b3d1af2fb43f119e0c011e2350728169c82acd (diff) | |
| download | mitmproxy-6b2383a9d8b3f170adba98b384dcc4b29acd0ddf.tar.gz mitmproxy-6b2383a9d8b3f170adba98b384dcc4b29acd0ddf.tar.bz2 mitmproxy-6b2383a9d8b3f170adba98b384dcc4b29acd0ddf.zip | |
minor adjustments
| -rw-r--r-- | mitmproxy/connections.py | 5 | ||||
| -rw-r--r-- | mitmproxy/proxy/protocol/tls.py | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/mitmproxy/connections.py b/mitmproxy/connections.py index 6d4d648f..f914c7d2 100644 --- a/mitmproxy/connections.py +++ b/mitmproxy/connections.py @@ -112,9 +112,10 @@ class ClientConnection(tcp.BaseHandler, stateobject.StateObject): tls_version=None, )) - def convert_to_ssl(self, *args, **kwargs): - super().convert_to_ssl(*args, **kwargs) + def convert_to_ssl(self, cert, *args, **kwargs): + super().convert_to_ssl(cert, *args, **kwargs) self.timestamp_ssl_setup = time.time() + self.mitmcert = cert sni = self.connection.get_servername() if sni: self.sni = sni.decode("idna") diff --git a/mitmproxy/proxy/protocol/tls.py b/mitmproxy/proxy/protocol/tls.py index c174b003..08ce53d0 100644 --- a/mitmproxy/proxy/protocol/tls.py +++ b/mitmproxy/proxy/protocol/tls.py @@ -465,8 +465,6 @@ class TlsLayer(base.Layer): self.log("Establish TLS with client", "debug") cert, key, chain_file = self._find_cert() - self.client_conn.mitmcert = cert - if self.config.options.add_upstream_certs_to_client_chain: extra_certs = self.server_conn.server_certs else: |