diff options
| author | Aldo Cortesi <aldo@nullcube.com> | 2014-03-07 16:38:24 +1300 |
|---|---|---|
| committer | Aldo Cortesi <aldo@nullcube.com> | 2014-03-07 16:38:24 +1300 |
| commit | 221973aff6553ffb1d40859c5d35b88d959f9718 (patch) | |
| tree | 7bc325fae6224ac36953e380b3d24a974ea5b869 /libmproxy | |
| parent | 9b17d272a351c2f63748a565dcdb9823f9cea34b (diff) | |
| download | mitmproxy-221973aff6553ffb1d40859c5d35b88d959f9718.tar.gz mitmproxy-221973aff6553ffb1d40859c5d35b88d959f9718.tar.bz2 mitmproxy-221973aff6553ffb1d40859c5d35b88d959f9718.zip | |
Revert to old cert names, use a subdir for test conf dir.
Diffstat (limited to 'libmproxy')
| -rw-r--r-- | libmproxy/app.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libmproxy/app.py b/libmproxy/app.py index 3ebbb61b..24187704 100644 --- a/libmproxy/app.py +++ b/libmproxy/app.py @@ -1,5 +1,5 @@ import flask -import os.path +import os.path, os import proxy mapp = flask.Flask(__name__) @@ -17,12 +17,12 @@ def index(): @mapp.route("/cert/pem") def certs_pem(): - p = os.path.join(master().server.config.confdir, proxy.CONF_BASENAME + "-cert.pem") + p = os.path.join(master().server.config.confdir, proxy.CONF_BASENAME + "-ca-cert.pem") return flask.Response(open(p, "rb").read(), mimetype='application/x-x509-ca-cert') @mapp.route("/cert/p12") def certs_p12(): - p = os.path.join(master().server.config.confdir, proxy.CONF_BASENAME + "-cert.p12") + p = os.path.join(master().server.config.confdir, proxy.CONF_BASENAME + "-ca-cert.p12") return flask.Response(open(p, "rb").read(), mimetype='application/x-pkcs12') |