diff options
| author | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2018-01-06 10:43:33 +0100 |
|---|---|---|
| committer | Thomas Kriechbaumer <thomas@kriechbaumer.name> | 2018-01-06 10:43:54 +0100 |
| commit | d15e96dee1d6c3c752434663bf6ea8a547d09d28 (patch) | |
| tree | 6d78fd9542ab5b6417a73f8ec2d7f937d12605d5 /mitmproxy/proxy | |
| parent | 9aae3213b9ebaa1ba1d23790fe4ccc5e03140cf4 (diff) | |
| download | mitmproxy-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/proxy')
| -rw-r--r-- | mitmproxy/proxy/protocol/http_replay.py | 4 | ||||
| -rw-r--r-- | mitmproxy/proxy/protocol/tls.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mitmproxy/proxy/protocol/http_replay.py b/mitmproxy/proxy/protocol/http_replay.py index cc22c0b7..022e8133 100644 --- a/mitmproxy/proxy/protocol/http_replay.py +++ b/mitmproxy/proxy/protocol/http_replay.py @@ -75,7 +75,7 @@ class RequestReplayThread(basethread.BaseThread): ) if resp.status_code != 200: raise exceptions.ReplayException("Upstream server refuses CONNECT request") - server.establish_ssl( + server.establish_tls( self.options.client_certs, sni=self.f.server_conn.sni ) @@ -90,7 +90,7 @@ class RequestReplayThread(basethread.BaseThread): ) server.connect() if r.scheme == "https": - server.establish_ssl( + server.establish_tls( self.options.client_certs, sni=self.f.server_conn.sni ) diff --git a/mitmproxy/proxy/protocol/tls.py b/mitmproxy/proxy/protocol/tls.py index afe9b78c..ed0a96bb 100644 --- a/mitmproxy/proxy/protocol/tls.py +++ b/mitmproxy/proxy/protocol/tls.py @@ -487,7 +487,7 @@ class TlsLayer(base.Layer): extra_certs = None try: - self.client_conn.convert_to_ssl( + self.client_conn.convert_to_tls( cert, key, method=self.config.openssl_method_client, options=self.config.openssl_options_client, @@ -543,7 +543,7 @@ class TlsLayer(base.Layer): ciphers_server.append(CIPHER_ID_NAME_MAP[id]) ciphers_server = ':'.join(ciphers_server) - self.server_conn.establish_ssl( + self.server_conn.establish_tls( self.config.client_certs, self.server_sni, method=self.config.openssl_method_server, |