diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2018-01-06 10:50:26 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2018-01-07 19:55:04 +0100 |
| commit | 4fb894cad4cf1c1d4a89eef8af35d4523a198f28 (patch) | |
| tree | a78dfb5fcfd29e54a06b47bb29b51cfc0ca9b4dd /mitmproxy/io | |
| parent | d15e96dee1d6c3c752434663bf6ea8a547d09d28 (diff) | |
| download | mitmproxy-4fb894cad4cf1c1d4a89eef8af35d4523a198f28.tar.gz mitmproxy-4fb894cad4cf1c1d4a89eef8af35d4523a198f28.tar.bz2 mitmproxy-4fb894cad4cf1c1d4a89eef8af35d4523a198f28.zip | |
avoid TLS/SSL ambiguity for Cert class
Diffstat (limited to 'mitmproxy/io')
| -rw-r--r-- | mitmproxy/io/compat.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mitmproxy/io/compat.py b/mitmproxy/io/compat.py index 221288c6..ecf852e7 100644 --- a/mitmproxy/io/compat.py +++ b/mitmproxy/io/compat.py @@ -161,8 +161,8 @@ def convert_5_6(data): data["server_conn"]["tls_established"] = data["server_conn"].pop("ssl_established") data["server_conn"]["timestamp_tls_setup"] = data["server_conn"].pop("timestamp_ssl_setup") if data["server_conn"]["via"]: - data["server_conn"]["via"]["tls_established"] = data["server_conn"]["via"].pop("ssl_established", None) - data["server_conn"]["via"]["timestamp_tls_setup"] = data["server_conn"]["via"].pop("timestamp_ssl_setup", None) + data["server_conn"]["via"]["tls_established"] = data["server_conn"]["via"].pop("ssl_established") + data["server_conn"]["via"]["timestamp_tls_setup"] = data["server_conn"]["via"].pop("timestamp_ssl_setup") return data |