diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2015-03-02 14:35:50 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2015-03-02 14:35:50 +0100 |
| commit | 75ba0a92e4dd0f331505f450d6baa89b18abe2f2 (patch) | |
| tree | ee5225733a807d8f34fec9c0c46076a0b689c76d /libmproxy/proxy/server.py | |
| parent | 7cf1ec7435d6893555152136fcd346eb9bec5fbc (diff) | |
| download | mitmproxy-75ba0a92e4dd0f331505f450d6baa89b18abe2f2.tar.gz mitmproxy-75ba0a92e4dd0f331505f450d6baa89b18abe2f2.tar.bz2 mitmproxy-75ba0a92e4dd0f331505f450d6baa89b18abe2f2.zip | |
do some housekeeping
Diffstat (limited to 'libmproxy/proxy/server.py')
| -rw-r--r-- | libmproxy/proxy/server.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libmproxy/proxy/server.py b/libmproxy/proxy/server.py index cb6d3c70..896dd024 100644 --- a/libmproxy/proxy/server.py +++ b/libmproxy/proxy/server.py @@ -187,9 +187,9 @@ class ConnectionHandler: self.server_conn.establish_ssl( self.config.clientcerts, sni, - method=self.config.openssl_server_method, - options=self.config.openssl_server_options, - cipher_list=self.config.server_ciphers, + method=self.config.openssl_method_server, + options=self.config.openssl_options_server, + cipher_list=self.config.ciphers_server, ) except tcp.NetLibError as v: e = ProxyError(502, repr(v)) @@ -208,10 +208,10 @@ class ConnectionHandler: try: self.client_conn.convert_to_ssl( cert, key, - method=self.config.openssl_client_method, - options=self.config.openssl_client_options, + method=self.config.openssl_method_client, + options=self.config.openssl_options_client, handle_sni=self.handle_sni, - cipher_list=self.config.client_ciphers, + cipher_list=self.config.ciphers_client, dhparams=self.config.certstore.dhparams, chain_file=chain_file ) @@ -297,9 +297,9 @@ class ConnectionHandler: cert, key, chain_file = self.find_cert() new_context = self.client_conn._create_ssl_context( cert, key, - method=self.config.openssl_client_method, - options=self.config.openssl_client_options, - cipher_list=self.config.client_ciphers, + method=self.config.openssl_method_client, + options=self.config.openssl_options_client, + cipher_list=self.config.ciphers_client, dhparams=self.config.certstore.dhparams, chain_file=chain_file ) |