diff options
author | Maximilian Hils <git@maximilianhils.com> | 2015-08-16 23:25:02 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-16 23:25:02 +0200 |
commit | a2b85048892626e6834df06e9022498814724636 (patch) | |
tree | 4b020376b618617c44355710aba4cbd6ba82b6b0 /libmproxy/protocol2/tls.py | |
parent | c04fa1b233224d28e85be34ab5b6a8718497488c (diff) | |
download | mitmproxy-a2b85048892626e6834df06e9022498814724636.tar.gz mitmproxy-a2b85048892626e6834df06e9022498814724636.tar.bz2 mitmproxy-a2b85048892626e6834df06e9022498814724636.zip |
improve protocol handling
Diffstat (limited to 'libmproxy/protocol2/tls.py')
-rw-r--r-- | libmproxy/protocol2/tls.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmproxy/protocol2/tls.py b/libmproxy/protocol2/tls.py index fcc12f18..12c67f4e 100644 --- a/libmproxy/protocol2/tls.py +++ b/libmproxy/protocol2/tls.py @@ -220,7 +220,7 @@ class TlsLayer(Layer): host = self.server_conn.address.host sans = set() # Incorporate upstream certificate - if self.server_conn.tls_established and (not self.config.no_upstream_cert): + if self.server_conn and self.server_conn.tls_established and (not self.config.no_upstream_cert): upstream_cert = self.server_conn.cert sans.update(upstream_cert.altnames) if upstream_cert.cn: @@ -232,4 +232,5 @@ class TlsLayer(Layer): if self._sni_from_server_change: sans.add(self._sni_from_server_change) + sans.discard(host) return self.config.certstore.get_cert(host, list(sans)) |