diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2018-01-07 20:21:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-07 20:21:49 +0100 |
| commit | 94a173ab9c54c9f8a669c92cf77adcfbe902d565 (patch) | |
| tree | 346bc53ed2a4aff60eb8b44302952dcf30eeb629 /pathod | |
| parent | c1dad83b32a39cdc2db8168de51a4c3061292f36 (diff) | |
| parent | 4fb894cad4cf1c1d4a89eef8af35d4523a198f28 (diff) | |
| download | mitmproxy-94a173ab9c54c9f8a669c92cf77adcfbe902d565.tar.gz mitmproxy-94a173ab9c54c9f8a669c92cf77adcfbe902d565.tar.bz2 mitmproxy-94a173ab9c54c9f8a669c92cf77adcfbe902d565.zip | |
Merge pull request #2764 from Kriechi/ssl-tls
rename attributes, function and class names: s/ssl/tls/
Diffstat (limited to 'pathod')
| -rw-r--r-- | pathod/pathoc.py | 4 | ||||
| -rw-r--r-- | pathod/pathod.py | 4 | ||||
| -rw-r--r-- | pathod/protocols/http.py | 2 | ||||
| -rw-r--r-- | pathod/protocols/websockets.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/pathod/pathoc.py b/pathod/pathoc.py index e5fe4c2d..b177d556 100644 --- a/pathod/pathoc.py +++ b/pathod/pathoc.py @@ -79,7 +79,7 @@ class SSLInfo: } t = types.get(pk.type(), "Uknown") parts.append("\tPubkey: %s bit %s" % (pk.bits(), t)) - s = certs.SSLCert(i) + s = certs.Cert(i) if s.altnames: parts.append("\tSANs: %s" % " ".join(strutils.always_str(n, "utf8") for n in s.altnames)) return "\n".join(parts) @@ -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 f8e64f9e..17db57ee 100644 --- a/pathod/pathod.py +++ b/pathod/pathod.py @@ -170,7 +170,7 @@ class PathodHandler(tcp.BaseHandler): ), cipher=None, ) - if self.ssl_established: + if self.tls_established: retlog["cipher"] = self.get_current_cipher() m = utils.MemBool() @@ -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, diff --git a/pathod/protocols/websockets.py b/pathod/protocols/websockets.py index 2d1f1bf6..63e6ee0b 100644 --- a/pathod/protocols/websockets.py +++ b/pathod/protocols/websockets.py @@ -30,7 +30,7 @@ class WebsocketsProtocol: ), cipher=None, ) - if self.pathod_handler.ssl_established: + if self.pathod_handler.tls_established: retlog["cipher"] = self.pathod_handler.get_current_cipher() self.pathod_handler.addlog(retlog) ld = language.websockets.NESTED_LEADER |