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/pathod.py | |
| 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/pathod.py')
| -rw-r--r-- | pathod/pathod.py | 4 |
1 files changed, 2 insertions, 2 deletions
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, |