diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2015-06-27 09:22:41 +1200 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2015-06-27 09:22:41 +1200 |
| commit | 5f277408cf850093f42e4716ee4f5ba475ec0a4c (patch) | |
| tree | 9780a967018df902ac2df8b74d2c216aeb31be96 /libmproxy/proxy/config.py | |
| parent | 7990503eaf738e655b50f8fb55d6eff9bd11bdec (diff) | |
| parent | b369962cbe632588baf7b10917e3d31b91a18dbd (diff) | |
| download | mitmproxy-5f277408cf850093f42e4716ee4f5ba475ec0a4c.tar.gz mitmproxy-5f277408cf850093f42e4716ee4f5ba475ec0a4c.tar.bz2 mitmproxy-5f277408cf850093f42e4716ee4f5ba475ec0a4c.zip | |
Merge pull request #654 from mitmproxy/remove_certforward
Remove Certforward Feature
Diffstat (limited to 'libmproxy/proxy/config.py')
| -rw-r--r-- | libmproxy/proxy/config.py | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libmproxy/proxy/config.py b/libmproxy/proxy/config.py index b6d73314..a7a719cf 100644 --- a/libmproxy/proxy/config.py +++ b/libmproxy/proxy/config.py @@ -48,7 +48,6 @@ class ProxyConfig: ciphers_client=None, ciphers_server=None, certs=[], - certforward=False, ssl_version_client=tcp.SSL_DEFAULT_METHOD, ssl_version_server=tcp.SSL_DEFAULT_METHOD, ssl_ports=TRANSPARENT_SSL_PORTS, @@ -91,7 +90,6 @@ class ProxyConfig: CONF_BASENAME) for spec, cert in certs: self.certstore.add_cert_file(spec, cert) - self.certforward = certforward self.ssl_ports = ssl_ports if isinstance(ssl_version_client, int): @@ -202,7 +200,6 @@ def process_proxy_options(parser, options): ciphers_client=options.ciphers_client, ciphers_server=options.ciphers_server, certs=certs, - certforward=options.certforward, ssl_version_client=options.ssl_version_client, ssl_version_server=options.ssl_version_server, ssl_ports=ssl_ports, @@ -226,11 +223,6 @@ def ssl_option_group(parser): 'The PEM file should contain the full certificate chain, with the leaf certificate as the first entry. ' 'Can be passed multiple times.') group.add_argument( - "--cert-forward", action="store_true", - dest="certforward", default=False, - help="Simply forward SSL certificates from upstream." - ) - group.add_argument( "--ciphers-client", action="store", type=str, dest="ciphers_client", default=None, help="Set supported ciphers for client connections. (OpenSSL Syntax)" |