aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2015-06-23 22:04:09 +1200
committerAldo Cortesi <aldo@nullcube.com>2015-06-23 22:04:09 +1200
commited06cdcdc989bf7e8c7814d937002a4ebea50a08 (patch)
tree2183ee1e9cc1c7c2704b6c040abe1e8aef36410f /test
parent5588e57ca4f002f1e569847901616397282f6b3b (diff)
parent58118d607e810e95fe8a0c0e6d7b8f4423f1f558 (diff)
downloadmitmproxy-ed06cdcdc989bf7e8c7814d937002a4ebea50a08.tar.gz
mitmproxy-ed06cdcdc989bf7e8c7814d937002a4ebea50a08.tar.bz2
mitmproxy-ed06cdcdc989bf7e8c7814d937002a4ebea50a08.zip
Merge branch 'ssl-version-handling' of https://github.com/Kriechi/netlib into Kriechi-ssl-version-handling
Diffstat (limited to 'test')
-rw-r--r--test/tservers.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/tservers.py b/test/tservers.py
index 899b51bd..09f1b095 100644
--- a/test/tservers.py
+++ b/test/tservers.py
@@ -83,10 +83,10 @@ class TServer(tcp.TCPServer):
OpenSSL.crypto.FILETYPE_PEM,
open(raw_key, "rb").read())
if self.ssl.get("v3_only", False):
- method = tcp.SSLv3_METHOD
+ method = OpenSSL.SSL.SSLv3_METHOD
options = OpenSSL.SSL.OP_NO_SSLv2 | OpenSSL.SSL.OP_NO_TLSv1
else:
- method = tcp.SSLv23_METHOD
+ method = OpenSSL.SSL.SSLv23_METHOD
options = None
h.convert_to_ssl(
cert, key,