aboutsummaryrefslogtreecommitdiffstats
path: root/mitmplayback
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 /mitmplayback
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 'mitmplayback')
-rwxr-xr-xmitmplayback8
1 files changed, 1 insertions, 7 deletions
diff --git a/mitmplayback b/mitmplayback
index 428d9a04..1553a604 100755
--- a/mitmplayback
+++ b/mitmplayback
@@ -56,17 +56,11 @@ if __name__ == '__main__':
if options.quiet:
options.verbose = 0
- proxy.process_certificate_option_group(parser, options)
if options.cache is not None:
options.cache = os.path.expanduser(options.cache)
- 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)
m = playback.PlaybackMaster(server, options)
m.run()