diff options
| author | Jim Shaver <dcypherd@gmail.com> | 2015-03-01 20:12:27 -0600 |
|---|---|---|
| committer | Jim Shaver <dcypherd@gmail.com> | 2015-03-01 20:12:27 -0600 |
| commit | b063d6020f18e8b0f3da56ebad557cec49a7ada5 (patch) | |
| tree | b910969ff372a266ed337551ffff76c75d1a0c05 /libmproxy | |
| parent | 6a1e2941496d1606f9a112cb83652e0609be31d6 (diff) | |
| download | mitmproxy-b063d6020f18e8b0f3da56ebad557cec49a7ada5.tar.gz mitmproxy-b063d6020f18e8b0f3da56ebad557cec49a7ada5.tar.bz2 mitmproxy-b063d6020f18e8b0f3da56ebad557cec49a7ada5.zip | |
specified cipher_list in a few more locations, added a missing comma
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/proxy/config.py | 6 | ||||
| -rw-r--r-- | libmproxy/proxy/server.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index 335d2dcf..0215f92c 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -45,7 +45,8 @@ class ProxyConfig: authenticator=None, ignore_hosts=[], tcp_hosts=[], - ciphers=None, + client_ciphers=None, + server_ciphers=None, certs=[], certforward=False, ssl_version_client="secure", @@ -189,7 +190,8 @@ def process_proxy_options(parser, options): ignore_hosts=options.ignore_hosts, tcp_hosts=options.tcp_hosts, authenticator=authenticator, - ciphers=options.ciphers, + client_ciphers=options.client_ciphers, + server_ciphers=options.server_ciphers, certs=certs, certforward=options.certforward, ssl_version_client=options.ssl_version_client, diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py index 7306331c..ebe91d22 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -188,7 +188,7 @@ class ConnectionHandler: self.config.clientcerts, sni, method=self.config.openssl_server_method, - options=self.config.openssl_server_options + options=self.config.openssl_server_options, cipher_list=self.config.server_ciphers, ) except tcp.NetLibError as v: |