From 8ed491201a8ec56585b0e35d9c17e18231b174f8 Mon Sep 17 00:00:00 2001 From: ikoz Date: Wed, 16 Mar 2016 22:45:27 +0000 Subject: Revert "Create mutually exclusive group for add-server-certs-to-client-chain and verify-upstream-cert command line options. These are not meaningful together." This reverts commit 02e378486b9daa7159503a4bdcd7bed9d85e119e. --- mitmproxy/cmdline.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mitmproxy/cmdline.py b/mitmproxy/cmdline.py index 7b9f2b82..d7de350f 100644 --- a/mitmproxy/cmdline.py +++ b/mitmproxy/cmdline.py @@ -434,14 +434,13 @@ def proxy_ssl_options(parser): action="store_true", dest="no_upstream_cert", help="Don't connect to upstream server to look up certificate details." ) - subgroup = group.add_mutually_exclusive_group() - subgroup.add_argument( + group.add_argument( "--add-upstream-certs-to-client-chain", default=False, action="store_true", dest="add_upstream_certs_to_client_chain", help="Add all certificates of the upstream server to the certificate chain " "that will be served to the proxy client, as extras." ) - subgroup.add_argument( + group.add_argument( "--verify-upstream-cert", default=False, action="store_true", dest="ssl_verify_upstream_cert", help="Verify upstream server SSL/TLS certificates and fail if invalid " -- cgit v1.2.3