aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <thomas@kriechbaumer.name>2016-12-10 14:29:48 +0100
committerThomas Kriechbaumer <thomas@kriechbaumer.name>2016-12-10 14:29:51 +0100
commit7bae941eccfe0cd751d31150e08720a21a8c0786 (patch)
tree8a3f08636f12654ce41da5043472f6c8edf90471
parent4771abf2291947d580858c7fe58e25dbf0850abd (diff)
downloadmitmproxy-7bae941eccfe0cd751d31150e08720a21a8c0786.tar.gz
mitmproxy-7bae941eccfe0cd751d31150e08720a21a8c0786.tar.bz2
mitmproxy-7bae941eccfe0cd751d31150e08720a21a8c0786.zip
remove backport.ssl_match_hostname
This is already included in Python 3.5+
-rw-r--r--mitmproxy/net/tcp.py8
-rw-r--r--setup.py1
2 files changed, 4 insertions, 5 deletions
diff --git a/mitmproxy/net/tcp.py b/mitmproxy/net/tcp.py
index 11cabf07..2dd32c9b 100644
--- a/mitmproxy/net/tcp.py
+++ b/mitmproxy/net/tcp.py
@@ -5,15 +5,15 @@ import sys
import threading
import time
import traceback
-
import binascii
+from ssl import match_hostname
+from ssl import CertificateError
from typing import Optional # noqa
from mitmproxy.utils import strutils
import certifi
-from backports import ssl_match_hostname
import OpenSSL
from OpenSSL import SSL
@@ -726,8 +726,8 @@ class TCPClient(_Connection):
hostname = sni
else:
hostname = "no-hostname"
- ssl_match_hostname.match_hostname(crt, hostname)
- except (ValueError, ssl_match_hostname.CertificateError) as e:
+ match_hostname(crt, hostname)
+ except (ValueError, CertificateError) as e:
self.ssl_verification_error = exceptions.InvalidCertificateException(
"Certificate Verification Error for {}: {}".format(
sni or repr(self.address),
diff --git a/setup.py b/setup.py
index 56ba46fc..af5ab534 100644
--- a/setup.py
+++ b/setup.py
@@ -58,7 +58,6 @@ setup(
# https://packaging.python.org/en/latest/requirements/#install-requires
# It is not considered best practice to use install_requires to pin dependencies to specific versions.
install_requires=[
- "backports.ssl_match_hostname>=3.5.0.1, <3.6",
"blinker>=1.4, <1.5",
"click>=6.2, <7.0",
"certifi>=2015.11.20.1", # no semver here - this should always be on the last release!