aboutsummaryrefslogtreecommitdiffstats
path: root/netlib/test.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2014-03-07 16:38:50 +1300
committerAldo Cortesi <aldo@nullcube.com>2014-03-07 16:38:50 +1300
commit2a12aa3c47d57cc2d3a36f6726a5f081ca493457 (patch)
treef3522a95be2533f893859e940e23383b5591f6df /netlib/test.py
parent52b14aa1d1bbeb3e2b8c62ee9939b9575ee1840f (diff)
downloadmitmproxy-2a12aa3c47d57cc2d3a36f6726a5f081ca493457.tar.gz
mitmproxy-2a12aa3c47d57cc2d3a36f6726a5f081ca493457.tar.bz2
mitmproxy-2a12aa3c47d57cc2d3a36f6726a5f081ca493457.zip
Support Ephemeral Diffie-Hellman
Diffstat (limited to 'netlib/test.py')
-rw-r--r--netlib/test.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/netlib/test.py b/netlib/test.py
index b88b3586..bb0012ad 100644
--- a/netlib/test.py
+++ b/netlib/test.py
@@ -18,7 +18,6 @@ class ServerTestBase:
ssl = None
handler = None
addr = ("localhost", 0)
-
@classmethod
def setupAll(cls):
cls.q = Queue.Queue()
@@ -43,15 +42,16 @@ class ServerTestBase:
class TServer(tcp.TCPServer):
def __init__(self, ssl, q, handler_klass, addr):
"""
- ssl: A {cert, key, v3_only} dict.
+ ssl: A dictionary of SSL parameters:
+
+ cert, key, request_client_cert, cipher_list,
+ dhparams, v3_only
"""
tcp.TCPServer.__init__(self, addr)
self.ssl, self.q = ssl, q
self.handler_klass = handler_klass
self.last_handler = None
-
-
def handle_client_connection(self, request, client_address):
h = self.handler_klass(request, client_address, self)
self.last_handler = h
@@ -73,7 +73,8 @@ class TServer(tcp.TCPServer):
options = options,
handle_sni = getattr(h, "handle_sni", None),
request_client_cert = self.ssl["request_client_cert"],
- cipher_list = self.ssl.get("cipher_list", None)
+ cipher_list = self.ssl.get("cipher_list", None),
+ dhparams = self.ssl.get("dhparams", None)
)
h.handle()
h.finish()