diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-03-02 14:25:14 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-03-02 14:25:14 +0100 |
| commit | 7cf1ec7435d6893555152136fcd346eb9bec5fbc (patch) | |
| tree | 307ded3901791896caa4bb48cc249819c37f8da8 /libmproxy/proxy/server.py | |
| parent | dff70150f5197173c5534cd947d2824c166c4527 (diff) | |
| parent | 5e07fe08ea80a860a215fe65b8430698261c7cb7 (diff) | |
| download | mitmproxy-7cf1ec7435d6893555152136fcd346eb9bec5fbc.tar.gz mitmproxy-7cf1ec7435d6893555152136fcd346eb9bec5fbc.tar.bz2 mitmproxy-7cf1ec7435d6893555152136fcd346eb9bec5fbc.zip | |
Merge pull request #493 from elitest/master
Adding support for server facing SSL cipher suite specification
Diffstat (limited to 'libmproxy/proxy/server.py')
| -rw-r--r-- | libmproxy/proxy/server.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py index 8544ff72..cb6d3c70 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -188,7 +188,8 @@ 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: e = ProxyError(502, repr(v)) @@ -210,7 +211,7 @@ class ConnectionHandler: method=self.config.openssl_client_method, options=self.config.openssl_client_options, handle_sni=self.handle_sni, - cipher_list=self.config.ciphers, + cipher_list=self.config.client_ciphers, dhparams=self.config.certstore.dhparams, chain_file=chain_file ) @@ -298,7 +299,7 @@ class ConnectionHandler: cert, key, method=self.config.openssl_client_method, options=self.config.openssl_client_options, - cipher_list=self.config.ciphers, + cipher_list=self.config.client_ciphers, dhparams=self.config.certstore.dhparams, chain_file=chain_file ) |