diff options
author | Maximilian Hils <git@maximilianhils.com> | 2014-10-08 20:44:52 +0200 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2014-10-08 20:44:52 +0200 |
commit | d5c318b070305ac51e6b37f80336ab471af28d26 (patch) | |
tree | cd392ef8ce84b7f38965834a6fd636b411367817 /libmproxy/proxy/config.py | |
parent | 76bd554cd19b36353ee0cb1837faabc792039a9b (diff) | |
download | mitmproxy-d5c318b070305ac51e6b37f80336ab471af28d26.tar.gz mitmproxy-d5c318b070305ac51e6b37f80336ab471af28d26.tar.bz2 mitmproxy-d5c318b070305ac51e6b37f80336ab471af28d26.zip |
fix support for chained certificates
Diffstat (limited to 'libmproxy/proxy/config.py')
-rw-r--r-- | libmproxy/proxy/config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index 62104a24..24e09b6a 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -16,7 +16,7 @@ def parse_host_pattern(patterns): class ProxyConfig: def __init__(self, host='', port=8080, server_version=version.NAMEVERSION, - confdir=CONF_DIR, ca_file=None, clientcerts=None, + confdir=CONF_DIR, default_ca=None, clientcerts=None, no_upstream_cert=False, body_size_limit=None, mode=None, upstream_server=None, http_form_in=None, http_form_out=None, authenticator=None, ignore=[], @@ -45,7 +45,7 @@ class ProxyConfig: self.ignore = parse_host_pattern(ignore) self.authenticator = authenticator self.confdir = os.path.expanduser(confdir) - self.ca_file = ca_file or os.path.join(self.confdir, CONF_BASENAME + "-ca.pem") + self.default_ca = default_ca or os.path.join(self.confdir, CONF_BASENAME + "-ca.pem") self.certstore = certutils.CertStore.from_store(self.confdir, CONF_BASENAME) for spec, cert in certs: self.certstore.add_cert_file(spec, cert) |