From e22fd74d06bf646e7da95cde8f7238763f081276 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Fri, 18 Mar 2011 16:45:31 +1300 Subject: Revamp key generation. We now create three different files in the .mitmproxy directory when a dummy CA is made: mitmproxy-ca.pem - the CA, including private key mitmproxy-ca-cert.p12 - A pkcs12 version of the certificate, for distribution to Windows. mitmproxy-ca-cert.pem - A PEM version of the certificate, for distribution to everyone else. --- test/tutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/tutils.py') diff --git a/test/tutils.py b/test/tutils.py index ae9dea27..fea7f224 100644 --- a/test/tutils.py +++ b/test/tutils.py @@ -43,7 +43,7 @@ HTTPS_PORT = random.randint(30000, 40000) class TestMaster(controller.Master): def __init__(self, port, testq): - serv = proxy.ProxyServer(proxy.Config("data/testkey.pem"), port) + serv = proxy.ProxyServer(proxy.SSLConfig("data/testkey.pem"), port) controller.Master.__init__(self, serv) self.testq = testq self.log = [] -- cgit v1.2.3