diff options
author | Aldo Cortesi <aldo@nullcube.com> | 2015-06-23 22:18:10 +1200 |
---|---|---|
committer | Aldo Cortesi <aldo@nullcube.com> | 2015-06-23 22:18:10 +1200 |
commit | 80dd703a2a230ace2159d47e499fbb1196bba27e (patch) | |
tree | b4dc5a31e68bb28b30fe2ec62d54c0c9e0d75cb4 /test/tservers.py | |
parent | 239f4758afa65995769e896d8f4faa9e12414d28 (diff) | |
parent | ed06cdcdc989bf7e8c7814d937002a4ebea50a08 (diff) | |
download | mitmproxy-80dd703a2a230ace2159d47e499fbb1196bba27e.tar.gz mitmproxy-80dd703a2a230ace2159d47e499fbb1196bba27e.tar.bz2 mitmproxy-80dd703a2a230ace2159d47e499fbb1196bba27e.zip |
Merge branch 'Kriechi-ssl-version-handling'
Diffstat (limited to 'test/tservers.py')
-rw-r--r-- | test/tservers.py | 4 |
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, |