aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/utils
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2018-05-10 11:39:55 +1200
committerAldo Cortesi <aldo@corte.si>2018-05-10 11:40:33 +1200
commit9830e5b597ffbfae1781eb486c8cd8b0ba3c5dc7 (patch)
tree50e314493c7d17f01f4440f4798c5dc8bfd02be4 /mitmproxy/utils
parent3438912236a25d7d3bcbff3238156b9eae2bc3d5 (diff)
downloadmitmproxy-9830e5b597ffbfae1781eb486c8cd8b0ba3c5dc7.tar.gz
mitmproxy-9830e5b597ffbfae1781eb486c8cd8b0ba3c5dc7.tar.bz2
mitmproxy-9830e5b597ffbfae1781eb486c8cd8b0ba3c5dc7.zip
cadir -> confdir
We store a lot more than just the CAs in our configuration directory. Clarify the option name.
Diffstat (limited to 'mitmproxy/utils')
-rw-r--r--mitmproxy/utils/arg_check.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/mitmproxy/utils/arg_check.py b/mitmproxy/utils/arg_check.py
index 9c582c4c..123ae265 100644
--- a/mitmproxy/utils/arg_check.py
+++ b/mitmproxy/utils/arg_check.py
@@ -1,7 +1,7 @@
import sys
DEPRECATED = """
---cadir
+--confdir
-Z
--body-size-limit
--stream
@@ -22,7 +22,7 @@ DEPRECATED = """
--client-certs
--no-upstream-cert
--add-upstream-certs-to-client-chain
---upstream-trusted-cadir
+--upstream-trusted-confdir
--upstream-trusted-ca
--ssl-version-client
--ssl-version-server
@@ -72,7 +72,7 @@ REPLACEMENTS = {
"--no-http2-priority": "http2_priority",
"--no-websocket": "websocket",
"--no-upstream-cert": "upstream_cert",
- "--upstream-trusted-cadir": "ssl_verify_upstream_trusted_cadir",
+ "--upstream-trusted-confdir": "ssl_verify_upstream_trusted_confdir",
"--upstream-trusted-ca": "ssl_verify_upstream_trusted_ca",
"--no-onboarding": "onboarding",
"--no-pop": "server_replay_nopop",