aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/connections.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2018-01-06 10:50:26 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2018-01-07 19:55:04 +0100
commit4fb894cad4cf1c1d4a89eef8af35d4523a198f28 (patch)
treea78dfb5fcfd29e54a06b47bb29b51cfc0ca9b4dd /mitmproxy/connections.py
parentd15e96dee1d6c3c752434663bf6ea8a547d09d28 (diff)
downloadmitmproxy-4fb894cad4cf1c1d4a89eef8af35d4523a198f28.tar.gz
mitmproxy-4fb894cad4cf1c1d4a89eef8af35d4523a198f28.tar.bz2
mitmproxy-4fb894cad4cf1c1d4a89eef8af35d4523a198f28.zip
avoid TLS/SSL ambiguity for Cert class
Diffstat (limited to 'mitmproxy/connections.py')
-rw-r--r--mitmproxy/connections.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mitmproxy/connections.py b/mitmproxy/connections.py
index 290782c2..d1869157 100644
--- a/mitmproxy/connections.py
+++ b/mitmproxy/connections.py
@@ -87,8 +87,8 @@ class ClientConnection(tcp.BaseHandler, stateobject.StateObject):
id=str,
address=tuple,
tls_established=bool,
- clientcert=certs.SSLCert,
- mitmcert=certs.SSLCert,
+ clientcert=certs.Cert,
+ mitmcert=certs.Cert,
timestamp_start=float,
timestamp_tls_setup=float,
timestamp_end=float,
@@ -215,7 +215,7 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject):
ip_address=tuple,
source_address=tuple,
tls_established=bool,
- cert=certs.SSLCert,
+ cert=certs.Cert,
sni=str,
alpn_proto_negotiated=bytes,
tls_version=str,