diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2016-07-19 12:17:30 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2016-07-19 16:25:09 +1200 |
| commit | 98bf544664dcbf4b8846d1dbe5c07d053baad184 (patch) | |
| tree | 2f4ea5948bf9b039e4a1ec376f1903e07ddd607c /mitmproxy | |
| parent | 0a3839375de80a032f244c62ee254199750e5f91 (diff) | |
| download | mitmproxy-98bf544664dcbf4b8846d1dbe5c07d053baad184.tar.gz mitmproxy-98bf544664dcbf4b8846d1dbe5c07d053baad184.tar.bz2 mitmproxy-98bf544664dcbf4b8846d1dbe5c07d053baad184.zip | |
Regularize naming of upstream_trusted_ca* options
Diffstat (limited to 'mitmproxy')
| -rw-r--r-- | mitmproxy/protocol/tls.py | 4 | ||||
| -rw-r--r-- | mitmproxy/proxy/config.py | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mitmproxy/protocol/tls.py b/mitmproxy/protocol/tls.py index 7b8b8301..6dc4f64b 100644 --- a/mitmproxy/protocol/tls.py +++ b/mitmproxy/protocol/tls.py @@ -536,8 +536,8 @@ class TlsLayer(base.Layer): method=self.config.openssl_method_server, options=self.config.openssl_options_server, verify_options=self.config.openssl_verification_mode_server, - ca_path=self.config.openssl_trusted_cadir_server, - ca_pemfile=self.config.openssl_trusted_ca_server, + ca_path=self.config.options.ssl_verify_upstream_trusted_cadir, + ca_pemfile=self.config.options.ssl_verify_upstream_trusted_ca, cipher_list=ciphers_server, alpn_protos=alpn, ) diff --git a/mitmproxy/proxy/config.py b/mitmproxy/proxy/config.py index 201f7051..df7ca7ad 100644 --- a/mitmproxy/proxy/config.py +++ b/mitmproxy/proxy/config.py @@ -161,8 +161,6 @@ class ProxyConfig: self.upstream_server = parse_server_spec(options.upstream_server) if options.upstream_auth: self.upstream_auth = parse_upstream_auth(options.upstream_auth) - self.openssl_trusted_cadir_server = options.ssl_verify_upstream_trusted_cadir - self.openssl_trusted_ca_server = options.ssl_verify_upstream_trusted_ca def process_proxy_options(parser, options, args): |