diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-07-25 13:31:55 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-08-11 20:32:10 +0200 |
| commit | e815915b22ef266ac4122027a10c59d9e036d0b4 (patch) | |
| tree | 16f6ac87a1e966bf146062268ca0dc38f85efd37 /libmproxy/protocol2/ssl.py | |
| parent | c1d016823c67fc834a2fdb6c77181d14b5fd8008 (diff) | |
| download | mitmproxy-e815915b22ef266ac4122027a10c59d9e036d0b4.tar.gz mitmproxy-e815915b22ef266ac4122027a10c59d9e036d0b4.tar.bz2 mitmproxy-e815915b22ef266ac4122027a10c59d9e036d0b4.zip | |
add auto layer, multiple other fixes
Diffstat (limited to 'libmproxy/protocol2/ssl.py')
| -rw-r--r-- | libmproxy/protocol2/ssl.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmproxy/protocol2/ssl.py b/libmproxy/protocol2/ssl.py index 6b44bf42..e8ff16cf 100644 --- a/libmproxy/protocol2/ssl.py +++ b/libmproxy/protocol2/ssl.py @@ -5,9 +5,9 @@ import traceback from netlib import tcp from ..proxy import ProxyError2 -from . import Layer +from .layer import Layer from .messages import Connect, Reconnect, ChangeServer -from .rawtcp import TcpLayer +from .auto import AutoLayer class ReconnectRequest(object): @@ -61,7 +61,7 @@ class SslLayer(Layer): elif self.client_ssl: self._establish_ssl_with_client() - layer = TcpLayer(self) + layer = AutoLayer(self) for message in layer(): if message != Connect or not self._connected: yield message @@ -225,4 +225,4 @@ class SslLayer(Layer): if self._sni_from_server_change: sans.append(self._sni_from_server_change) - return self.config.certstore.get_cert(host, sans) + return self.config.certstore.get_cert(host, sans)
\ No newline at end of file |