aboutsummaryrefslogtreecommitdiffstats
path: root/pathod
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 /pathod
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 'pathod')
-rw-r--r--pathod/pathoc.py2
-rw-r--r--pathod/pathod.py2
-rw-r--r--pathod/protocols/http.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/pathod/pathoc.py b/pathod/pathoc.py
index e5fe4c2d..39a25b43 100644
--- a/pathod/pathoc.py
+++ b/pathod/pathoc.py
@@ -313,7 +313,7 @@ class Pathoc(tcp.TCPClient):
if self.use_http2:
alpn_protos.append(b'h2')
- self.convert_to_ssl(
+ self.convert_to_tls(
sni=self.sni,
cert=self.clientcert,
method=self.ssl_version,
diff --git a/pathod/pathod.py b/pathod/pathod.py
index 8abeaf41..17db57ee 100644
--- a/pathod/pathod.py
+++ b/pathod/pathod.py
@@ -244,7 +244,7 @@ class PathodHandler(tcp.BaseHandler):
if self.server.ssl:
try:
cert, key, _ = self.server.ssloptions.get_cert(None)
- self.convert_to_ssl(
+ self.convert_to_tls(
cert,
key,
handle_sni=self.handle_sni,
diff --git a/pathod/protocols/http.py b/pathod/protocols/http.py
index 4387b4fb..5fcb6618 100644
--- a/pathod/protocols/http.py
+++ b/pathod/protocols/http.py
@@ -27,7 +27,7 @@ class HTTPProtocol:
cert, key, chain_file_ = self.pathod_handler.server.ssloptions.get_cert(
connect[0].encode()
)
- self.pathod_handler.convert_to_ssl(
+ self.pathod_handler.convert_to_tls(
cert,
key,
handle_sni=self.pathod_handler.handle_sni,