Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2025-02-01 15:55:28 +00:00
Code Issues Projects Releases Wiki Activity

minor adjustments

Browse Source
This commit is contained in:
Maximilian Hils 2017-02-21 15:13:18 +01:00 committed by Thomas Kriechbaumer
parent 48b3d1af2f
commit 6b2383a9d8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mitmproxy/connections.py
View File

@ -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")

2
mitmproxy/proxy/protocol/tls.py
View File

@ -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: