aboutsummaryrefslogtreecommitdiffstats
path: root/test/test_tcp.py
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-06-26 13:26:35 +0200
committerMaximilian Hils <git@maximilianhils.com>2015-06-26 13:26:35 +0200
commit2723a0e5739412953f60c37d0dab81d684ba5f26 (patch)
treef4f103162580f8ae1c82f80937460c1c006ecff0 /test/test_tcp.py
parent41925b01f71831c33424d5cd9e612d003b99a69d (diff)
downloadmitmproxy-2723a0e5739412953f60c37d0dab81d684ba5f26.tar.gz
mitmproxy-2723a0e5739412953f60c37d0dab81d684ba5f26.tar.bz2
mitmproxy-2723a0e5739412953f60c37d0dab81d684ba5f26.zip
remove certffi
Diffstat (limited to 'test/test_tcp.py')
-rw-r--r--test/test_tcp.py38
1 files changed, 1 insertions, 37 deletions
diff --git a/test/test_tcp.py b/test/test_tcp.py
index 52398ef3..8a3299b6 100644
--- a/test/test_tcp.py
+++ b/test/test_tcp.py
@@ -10,7 +10,7 @@ import mock
from OpenSSL import SSL
import OpenSSL
-from netlib import tcp, certutils, certffi
+from netlib import tcp, certutils
from . import tutils, tservers
@@ -566,42 +566,6 @@ class TestDHParams(tservers.ServerTestBase):
assert os.path.exists(filename)
-class TestPrivkeyGen(tservers.ServerTestBase):
-
- class handler(tcp.BaseHandler):
-
- def handle(self):
- with tutils.tmpdir() as d:
- ca1 = certutils.CertStore.from_store(d, "test2")
- ca2 = certutils.CertStore.from_store(d, "test3")
- cert, _, _ = ca1.get_cert("foo.com", [])
- key = ca2.gen_pkey(cert)
- self.convert_to_ssl(cert, key)
-
- def test_privkey(self):
- c = tcp.TCPClient(("127.0.0.1", self.port))
- c.connect()
- tutils.raises("bad record mac", c.convert_to_ssl)
-
-
-class TestPrivkeyGenNoFlags(tservers.ServerTestBase):
-
- class handler(tcp.BaseHandler):
-
- def handle(self):
- with tutils.tmpdir() as d:
- ca1 = certutils.CertStore.from_store(d, "test2")
- ca2 = certutils.CertStore.from_store(d, "test3")
- cert, _, _ = ca1.get_cert("foo.com", [])
- certffi.set_flags(ca2.default_privatekey, 0)
- self.convert_to_ssl(cert, ca2.default_privatekey)
-
- def test_privkey(self):
- c = tcp.TCPClient(("127.0.0.1", self.port))
- c.connect()
- tutils.raises("sslv3 alert handshake failure", c.convert_to_ssl)
-
-
class TestTCPClient:
def test_conerr(self):