diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 01:39:50 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 01:39:50 +0100 |
| commit | 64139a1e7ed32f5d995c8fdea0d82c2d2d44f195 (patch) | |
| tree | 57f82ac4c4be727098a577f82e9d6a33a4c41e95 /netlib/test.py | |
| parent | 390f2a46c920ee332d758d6c46999b5147e0b30b (diff) | |
| parent | 7213f86d49960a625643fb6179e6a3731b16d462 (diff) | |
| download | mitmproxy-64139a1e7ed32f5d995c8fdea0d82c2d2d44f195.tar.gz mitmproxy-64139a1e7ed32f5d995c8fdea0d82c2d2d44f195.tar.bz2 mitmproxy-64139a1e7ed32f5d995c8fdea0d82c2d2d44f195.zip | |
merge origin/master
Diffstat (limited to 'netlib/test.py')
| -rw-r--r-- | netlib/test.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/netlib/test.py b/netlib/test.py index 661395c5..e7d4c233 100644 --- a/netlib/test.py +++ b/netlib/test.py @@ -52,7 +52,7 @@ class TServer(tcp.TCPServer): self.last_handler = h if self.ssl: cert = certutils.SSLCert.from_pem( - file(self.ssl["cert"], "r").read() + file(self.ssl["cert"], "rb").read() ) if self.ssl["v3_only"]: method = tcp.SSLv3_METHOD @@ -66,7 +66,8 @@ class TServer(tcp.TCPServer): method = method, options = options, handle_sni = getattr(h, "handle_sni", None), - request_client_cert = self.ssl["request_client_cert"] + request_client_cert = self.ssl["request_client_cert"], + cipher_list = self.ssl.get("cipher_list", None) ) h.handle() h.finish() |