aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy/protocol
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-12-15 12:46:13 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-12-15 12:46:13 +0100
commit4e635d7a6fa8d437ab4dbf9125ba2ed9533dcf0a (patch)
tree1b3230fcee53bfb7e5a4757dbaa708a85a9955a2 /libmproxy/protocol
parent955c5c87a261ad4083e4b3f1579625a2b53eb912 (diff)
downloadmitmproxy-4e635d7a6fa8d437ab4dbf9125ba2ed9533dcf0a.tar.gz
mitmproxy-4e635d7a6fa8d437ab4dbf9125ba2ed9533dcf0a.tar.bz2
mitmproxy-4e635d7a6fa8d437ab4dbf9125ba2ed9533dcf0a.zip
allow specification of SSL version, only allow TLS1.0+ by default
Diffstat (limited to 'libmproxy/protocol')
-rw-r--r--libmproxy/protocol/primitives.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/libmproxy/protocol/primitives.py b/libmproxy/protocol/primitives.py
index 3be1cc45..34526d01 100644
--- a/libmproxy/protocol/primitives.py
+++ b/libmproxy/protocol/primitives.py
@@ -188,7 +188,7 @@ class LiveConnection(object):
(
ssl != self.c.server_conn.ssl_established
or
- (sni is not None and sni != self.c.sni)
+ (sni is not None and sni != self.c.server_conn.sni)
)
)
address_mismatch = (address != self.c.server_conn.address)
@@ -219,10 +219,8 @@ class LiveConnection(object):
self.c.set_server_address(address)
self.c.establish_server_connection(ask=False)
- if sni:
- self.c.sni = sni
if ssl:
- self.c.establish_ssl(server=True)
+ self.c.establish_ssl(server=True, sni=sni)
return True
return False