Grasscutters/mitmproxy
3
0
Fork 0
mirror of https://github.com/Grasscutters/mitmproxy.git synced 2024-11-27 02:24:18 +00:00
Code Issues Projects Releases Wiki Activity

TCPClient: Use TLS1.1+ where available, BaseHandler: disable SSLv2

Browse Source
This commit is contained in:
Maximilian Hils 2014-12-15 12:32:36 +01:00
parent 7098c90a6d
commit 438c1fbc7d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
netlib/tcp.py
View File

@ -16,6 +16,8 @@ SSLv2_METHOD = SSL.SSLv2_METHOD
SSLv3_METHOD = SSL.SSLv3_METHOD SSLv3_METHOD = SSL.SSLv3_METHOD
SSLv23_METHOD = SSL.SSLv23_METHOD SSLv23_METHOD = SSL.SSLv23_METHOD
TLSv1_METHOD = SSL.TLSv1_METHOD TLSv1_METHOD = SSL.TLSv1_METHOD
OP_NO_SSLv2 = SSL.OP_NO_SSLv2
OP_NO_SSLv3 = SSL.OP_NO_SSLv3
class NetLibError(Exception): pass class NetLibError(Exception): pass
@ -288,7 +290,7 @@ class TCPClient(_Connection):
self.ssl_established = False self.ssl_established = False
self.sni = None self.sni = None
def convert_to_ssl(self, cert=None, sni=None, method=TLSv1_METHOD, options=None, cipher_list=None): def convert_to_ssl(self, cert=None, sni=None, method=SSLv23_METHOD, options=(OP_NO_SSLv2 | OP_NO_SSLv3), cipher_list=None):
""" """
cert: Path to a file containing both client cert and private key. cert: Path to a file containing both client cert and private key.
@ -362,7 +364,7 @@ class BaseHandler(_Connection):
self.ssl_established = False self.ssl_established = False
self.clientcert = None self.clientcert = None
def _create_ssl_context(self, cert, key, method=SSLv23_METHOD, options=None, def _create_ssl_context(self, cert, key, method=SSLv23_METHOD, options=OP_NO_SSLv2,
handle_sni=None, request_client_cert=None, cipher_list=None, handle_sni=None, request_client_cert=None, cipher_list=None,
dhparams=None, chain_file=None): dhparams=None, chain_file=None):
""" """