aboutsummaryrefslogtreecommitdiffstats
path: root/mitmdump
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2011-02-20 13:29:41 +1300
committerAldo Cortesi <aldo@nullcube.com>2011-02-20 13:29:41 +1300
commit7ddba22f515aa8997da0b5ee36c8ebc9961493dd (patch)
treedef335c030b962ed5926b1b96d444a20408ed024 /mitmdump
parentc2ae8285f4bc092a449d92f4bbdb150d586c2c51 (diff)
downloadmitmproxy-7ddba22f515aa8997da0b5ee36c8ebc9961493dd.tar.gz
mitmproxy-7ddba22f515aa8997da0b5ee36c8ebc9961493dd.tar.bz2
mitmproxy-7ddba22f515aa8997da0b5ee36c8ebc9961493dd.zip
Certificates are now generated in a temporary per-session directory.
This means that certificates don't accumulate in the conf directory, users don't have to clear certificates if the CA is regenerated, and the user can specify a custom CA without invalid certificates being loaded inadvertently.
Diffstat (limited to 'mitmdump')
-rwxr-xr-xmitmdump10
1 files changed, 1 insertions, 9 deletions
diff --git a/mitmdump b/mitmdump
index 56210f39..47726091 100755
--- a/mitmdump
+++ b/mitmdump
@@ -54,16 +54,8 @@ if __name__ == '__main__':
if options.quiet:
options.verbose = 0
- proxy.process_certificate_option_group(parser, options)
-
- config = proxy.Config(
- certfile = options.cert,
- certpath = options.certpath,
- cacert = options.cacert,
- ciphers = options.ciphers
- )
+ config = proxy.process_certificate_option_group(parser, options)
server = proxy.ProxyServer(config, options.port)
-
dumpopts = dump.Options(
verbosity = options.verbose,
wfile = options.wfile,