diff options
| author | Thomas Kriechbaumer <Kriechi@users.noreply.github.com> | 2016-07-07 09:48:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-07 09:48:22 +0200 |
| commit | 64ac2c73fe1c10bda9c5ff348e81f6dfaa7439b9 (patch) | |
| tree | bd1e5e6255f909d85e54d8a4e6f50aba6d0d2630 /netlib | |
| parent | 605a4fd2fda2249ffeb4e34117910700e1a6353f (diff) | |
| parent | 64a867973d5bac136c2e1c3c11c457d6b04d6649 (diff) | |
| download | mitmproxy-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')
| -rw-r--r-- | netlib/tcp.py | 4 | ||||
| -rw-r--r-- | netlib/utils.py | 4 |
2 files changed, 3 insertions, 5 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) diff --git a/netlib/utils.py b/netlib/utils.py index 79340cbd..23c16dc3 100644 --- a/netlib/utils.py +++ b/netlib/utils.py @@ -73,11 +73,9 @@ _label_valid = re.compile(b"(?!-)[A-Z\d-]{1,63}(?<!-)$", re.IGNORECASE) def is_valid_host(host): + # type: (bytes) -> bool """ Checks if a hostname is valid. - - Args: - host (bytes): The hostname """ try: host.decode("idna") |