diff options
| author | Aldo Cortesi <aldo@corte.si> | 2013-12-07 15:51:44 -0800 |
|---|---|---|
| committer | Aldo Cortesi <aldo@corte.si> | 2013-12-07 15:51:44 -0800 |
| commit | 98a580cf69f781f673701679623522f33389364f (patch) | |
| tree | dcc80b07366a56fda09eca98ab3960929c47db5d /netlib/tcp.py | |
| parent | af8f98d493095fe996c076e4dd365d5c0093c871 (diff) | |
| parent | d5b3e397e142ae60275fb89ea765423903e99bb6 (diff) | |
| download | mitmproxy-98a580cf69f781f673701679623522f33389364f.tar.gz mitmproxy-98a580cf69f781f673701679623522f33389364f.tar.bz2 mitmproxy-98a580cf69f781f673701679623522f33389364f.zip | |
Merge pull request #19 from rouli/ciphersuites
adding cipher list selection option to BaseHandler
Diffstat (limited to 'netlib/tcp.py')
| -rw-r--r-- | netlib/tcp.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/netlib/tcp.py b/netlib/tcp.py index c632ec67..8fe04d2e 100644 --- a/netlib/tcp.py +++ b/netlib/tcp.py @@ -267,7 +267,7 @@ class BaseHandler: self.clientcert = None - def convert_to_ssl(self, cert, key, method=SSLv23_METHOD, options=None, handle_sni=None, request_client_cert=False): + def convert_to_ssl(self, cert, key, method=SSLv23_METHOD, options=None, handle_sni=None, request_client_cert=False, cipher_list=None): """ cert: A certutils.SSLCert object. method: One of SSLv2_METHOD, SSLv3_METHOD, SSLv23_METHOD, or TLSv1_METHOD @@ -295,6 +295,8 @@ class BaseHandler: ctx = SSL.Context(method) if not options is None: ctx.set_options(options) + if cipher_list: + ctx.set_cipher_list(cipher_list) if handle_sni: # SNI callback happens during do_handshake() ctx.set_tlsext_servername_callback(handle_sni) |