diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-07-06 21:03:17 -0700 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-07-06 21:03:17 -0700 |
commit | 64a867973d5bac136c2e1c3c11c457d6b04d6649 (patch) | |
tree | 89b124368f8ed0c7973b4fa067239d505815b130 /netlib/tcp.py | |
parent | 8287ce7e6dcf31e65519629bb064044a44de46d1 (diff) | |
download | mitmproxy-64a867973d5bac136c2e1c3c11c457d6b04d6649.tar.gz mitmproxy-64a867973d5bac136c2e1c3c11c457d6b04d6649.tar.bz2 mitmproxy-64a867973d5bac136c2e1c3c11c457d6b04d6649.zip |
sni is now str, not bytes
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 69dafc1f..cf099edd 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -676,7 +676,7 @@ class TCPClient(_Connection): self.connection = SSL.Connection(context, self.connection) if sni: self.sni = sni - self.connection.set_tlsext_host_name(sni) + self.connection.set_tlsext_host_name(sni.encode("idna")) self.connection.set_connect_state() try: self.connection.do_handshake() @@ -705,7 +705,7 @@ class TCPClient(_Connection): if self.cert.cn: crt["subject"] = [[["commonName", self.cert.cn.decode("ascii", "strict")]]] if sni: - hostname = sni.decode("ascii", "strict") + hostname = sni else: hostname = "no-hostname" ssl_match_hostname.match_hostname(crt, hostname) |