diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2012-07-20 15:15:07 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2012-07-20 15:15:07 +1200 |
| commit | ba53d2e4caa34df883a2cd6322d607426c97201b (patch) | |
| tree | 9e50e2ce7078012b44db13207bf535523ed64d1f /netlib/tcp.py | |
| parent | a1a1663c0fc3a1e76637a0ef3997da697ea97cfe (diff) | |
| download | mitmproxy-ba53d2e4caa34df883a2cd6322d607426c97201b.tar.gz mitmproxy-ba53d2e4caa34df883a2cd6322d607426c97201b.tar.bz2 mitmproxy-ba53d2e4caa34df883a2cd6322d607426c97201b.zip | |
Set ssl_established right after the connection object is changed.
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index b7f2b3bc..3aee4c74 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -102,6 +102,7 @@ class TCPClient: if clientcert: context.use_certificate_file(self.clientcert) self.connection = SSL.Connection(context, self.connection) + self.ssl_established = True if sni: self.connection.set_tlsext_host_name(sni) self.connection.set_connect_state() @@ -112,7 +113,6 @@ class TCPClient: self.cert = certutils.SSLCert(self.connection.get_peer_certificate()) self.rfile = FileLike(self.connection) self.wfile = FileLike(self.connection) - self.ssl_established = True def connect(self): try: @@ -167,6 +167,7 @@ class BaseHandler: ctx.use_privatekey_file(key) ctx.use_certificate_file(cert) self.connection = SSL.Connection(ctx, self.connection) + self.ssl_established = True self.connection.set_accept_state() # SNI callback happens during do_handshake() try: @@ -175,7 +176,6 @@ class BaseHandler: raise NetLibError("SSL handshake error: %s"%str(v)) self.rfile = FileLike(self.connection) self.wfile = FileLike(self.connection) - self.ssl_established = True def finish(self): self.finished = True |