diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2013-08-12 16:03:29 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2013-08-12 16:03:29 +1200 |
| commit | 62edceee093dd54956ed5b623dfb4cb8c1309a16 (patch) | |
| tree | 5ccb3ad51edeca77c7f4ad5f9ea1c237177744ff /netlib/test.py | |
| parent | 2da57ecff0e9572e45663dbad1c5f520e57c531f (diff) | |
| download | mitmproxy-62edceee093dd54956ed5b623dfb4cb8c1309a16.tar.gz mitmproxy-62edceee093dd54956ed5b623dfb4cb8c1309a16.tar.bz2 mitmproxy-62edceee093dd54956ed5b623dfb4cb8c1309a16.zip | |
Revamp dummy cert generation.
We no longer use on-disk storage - we just keep the certs in memory.
Diffstat (limited to 'netlib/test.py')
| -rw-r--r-- | netlib/test.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/netlib/test.py b/netlib/test.py index deaef64e..661395c5 100644 --- a/netlib/test.py +++ b/netlib/test.py @@ -1,5 +1,5 @@ import threading, Queue, cStringIO -import tcp +import tcp, certutils class ServerThread(threading.Thread): def __init__(self, server): @@ -51,6 +51,9 @@ class TServer(tcp.TCPServer): h = self.handler_klass(request, client_address, self) self.last_handler = h if self.ssl: + cert = certutils.SSLCert.from_pem( + file(self.ssl["cert"], "r").read() + ) if self.ssl["v3_only"]: method = tcp.SSLv3_METHOD options = tcp.OP_NO_SSLv2|tcp.OP_NO_TLSv1 @@ -58,7 +61,7 @@ class TServer(tcp.TCPServer): method = tcp.SSLv23_METHOD options = None h.convert_to_ssl( - self.ssl["cert"], + cert, self.ssl["key"], method = method, options = options, |