aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/connections.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2018-01-06 10:43:33 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2018-01-06 10:43:54 +0100
commitd15e96dee1d6c3c752434663bf6ea8a547d09d28 (patch)
tree6d78fd9542ab5b6417a73f8ec2d7f937d12605d5 /mitmproxy/connections.py
parent9aae3213b9ebaa1ba1d23790fe4ccc5e03140cf4 (diff)
downloadmitmproxy-d15e96dee1d6c3c752434663bf6ea8a547d09d28.tar.gz
mitmproxy-d15e96dee1d6c3c752434663bf6ea8a547d09d28.tar.bz2
mitmproxy-d15e96dee1d6c3c752434663bf6ea8a547d09d28.zip
rename TLS/SSL-related functions
SSL is an outdated protocol superseeded by TLS. Although the commonly used library is called OpenSSL, it is no reason to still use outdated language for function names.
Diffstat (limited to 'mitmproxy/connections.py')
-rw-r--r--mitmproxy/connections.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mitmproxy/connections.py b/mitmproxy/connections.py
index 7cc50f66..290782c2 100644
--- a/mitmproxy/connections.py
+++ b/mitmproxy/connections.py
@@ -127,8 +127,8 @@ class ClientConnection(tcp.BaseHandler, stateobject.StateObject):
tls_version=None,
))
- def convert_to_ssl(self, cert, *args, **kwargs):
- super().convert_to_ssl(cert, *args, **kwargs)
+ def convert_to_tls(self, cert, *args, **kwargs):
+ super().convert_to_tls(cert, *args, **kwargs)
self.timestamp_tls_setup = time.time()
self.mitmcert = cert
sni = self.connection.get_servername()
@@ -261,7 +261,7 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject):
self.wfile.write(message)
self.wfile.flush()
- def establish_ssl(self, clientcerts, sni, **kwargs):
+ def establish_tls(self, clientcerts, sni, **kwargs):
if sni and not isinstance(sni, str):
raise ValueError("sni must be str, not " + type(sni).__name__)
clientcert = None
@@ -275,7 +275,7 @@ class ServerConnection(tcp.TCPClient, stateobject.StateObject):
if os.path.exists(path):
clientcert = path
- self.convert_to_ssl(cert=clientcert, sni=sni, **kwargs)
+ self.convert_to_tls(cert=clientcert, sni=sni, **kwargs)
self.sni = sni
self.alpn_proto_negotiated = self.get_alpn_proto_negotiated()
self.tls_version = self.connection.get_protocol_version_name()