aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/tcp.py
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2016-07-07 09:48:22 +0200
committerGitHub <noreply@github.com>2016-07-07 09:48:22 +0200
commit64ac2c73fe1c10bda9c5ff348e81f6dfaa7439b9 (patch)
treebd1e5e6255f909d85e54d8a4e6f50aba6d0d2630 /netlib/tcp.py
parent605a4fd2fda2249ffeb4e34117910700e1a6353f (diff)
parent64a867973d5bac136c2e1c3c11c457d6b04d6649 (diff)
downloadmitmproxy-64ac2c73fe1c10bda9c5ff348e81f6dfaa7439b9.tar.gz
mitmproxy-64ac2c73fe1c10bda9c5ff348e81f6dfaa7439b9.tar.bz2
mitmproxy-64ac2c73fe1c10bda9c5ff348e81f6dfaa7439b9.zip
Merge pull request #1318 from mhils/tnetstring3-unicode-type
[tests actually pass] Add unicode to tnetstring3
Diffstat (limited to 'netlib/tcp.py')
-rw-r--r--netlib/tcp.py4
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)