Revamp SSL configuration.

- Move option parsing utiliities to proxy.py

- Don't have a global config object. Pass it as an argument to ProxyServer.

- Simplify certificate generation logic.

1 files changed, 4 insertions, 4 deletions

diff --git a/mitmrecord b/mitmrecord
index 73376154..ec35bc85 100755
--- a/mitmrecord
+++ b/mitmrecord
@@ -29,7 +29,7 @@ if __name__ == '__main__':
                 version="%%prog %s"%VERSION,
             )
 
-    utils.certificate_option_group(parser)
+    proxy.certificate_option_group(parser)
 
     parser.add_option(
         "-p", "--port", action="store",
@@ -61,15 +61,15 @@ if __name__ == '__main__':
     if options.quiet:
         options.verbose = 0
 
-    utils.process_certificate_option_group(parser, options)
+    proxy.process_certificate_option_group(parser, options)
 
-    proxy.config = proxy.Config(
+    config = proxy.Config(
         certfile = options.cert,
         certpath = options.certpath,
         cacert   = options.cacert,
         ciphers = options.ciphers
     )
-    server = proxy.ProxyServer(options.port)
+    server = proxy.ProxyServer(config, options.port)
     utils.mkdir_p(options.cache)
     if os.path.exists(options.cache + "/index.txt"):
         print >> sys.stderr, "ERROR: data already recorded in %s"%options.cache