Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set ssl_established right after the connection object is changed.

This commit is contained in:
Aldo Cortesi 2012-07-20 15:15:07 +12:00
parent a1a1663c0f
commit ba53d2e4ca
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netlib/tcp.py
View File

@ -102,6 +102,7 @@ class TCPClient:
if clientcert: if clientcert:
context.use_certificate_file(self.clientcert) context.use_certificate_file(self.clientcert)
self.connection = SSL.Connection(context, self.connection) self.connection = SSL.Connection(context, self.connection)
self.ssl_established = True
if sni: if sni:
self.connection.set_tlsext_host_name(sni) self.connection.set_tlsext_host_name(sni)
self.connection.set_connect_state() self.connection.set_connect_state()
@ -112,7 +113,6 @@ class TCPClient:
self.cert = certutils.SSLCert(self.connection.get_peer_certificate()) self.cert = certutils.SSLCert(self.connection.get_peer_certificate())
self.rfile = FileLike(self.connection) self.rfile = FileLike(self.connection)
self.wfile = FileLike(self.connection) self.wfile = FileLike(self.connection)
self.ssl_established = True
def connect(self): def connect(self):
try: try:
@ -167,6 +167,7 @@ class BaseHandler:
ctx.use_privatekey_file(key) ctx.use_privatekey_file(key)
ctx.use_certificate_file(cert) ctx.use_certificate_file(cert)
self.connection = SSL.Connection(ctx, self.connection) self.connection = SSL.Connection(ctx, self.connection)
self.ssl_established = True
self.connection.set_accept_state() self.connection.set_accept_state()
# SNI callback happens during do_handshake() # SNI callback happens during do_handshake()
try: try:
@ -175,7 +176,6 @@ class BaseHandler:
raise NetLibError("SSL handshake error: %s"%str(v)) raise NetLibError("SSL handshake error: %s"%str(v))
self.rfile = FileLike(self.connection) self.rfile = FileLike(self.connection)
self.wfile = FileLike(self.connection) self.wfile = FileLike(self.connection)
self.ssl_established = True
def finish(self): def finish(self):
self.finished = True self.finished = True