diff options
Diffstat (limited to 'doc-src')
| -rw-r--r-- | doc-src/certinstall/android.html | 4 | ||||
| -rw-r--r-- | doc-src/index.py | 2 | ||||
| -rw-r--r-- | doc-src/ssl.html | 17 |
3 files changed, 20 insertions, 3 deletions
diff --git a/doc-src/certinstall/android.html b/doc-src/certinstall/android.html index f215d91d..9b0c5d71 100644 --- a/doc-src/certinstall/android.html +++ b/doc-src/certinstall/android.html @@ -14,7 +14,7 @@ below - your device may differ, but the broad process should be similar. ## Getting the certificate onto the device First we need to get the __mitmproxy-ca-cert.cer__ file into the -__/sdcard/Download__ folder on the device. There are a number of ways to do +__/sdcard__ folder on the device (/sdcard/Download on older devices). There are a number of ways to do this. If you have the Android Developer Tools installed, you can use [__adb push__](http://developer.android.com/tools/help/adb.html) to accomplish this. Depending on your device, you could also transfer the file using external media @@ -32,7 +32,7 @@ and select "Install from storage": <img src="android-settingssecuritymenu.png"/> -The certificate in /sdcard/Download is automatically located and offered for +The certificate in /sdcard is automatically located and offered for installation. Installing the cert will delete the download file from the local disk: diff --git a/doc-src/index.py b/doc-src/index.py index 6880bcae..3333a1b9 100644 --- a/doc-src/index.py +++ b/doc-src/index.py @@ -16,7 +16,7 @@ else: ns.title = countershape.template.Template(None, "<h1>@!this.title!@</h1>") -this.titlePrefix = "mitmproxy 0.9 - " +this.titlePrefix = "mitmproxy 0.10 - " this.markup = markup.Markdown(extras=["footnotes"]) ns.docMaintainer = "Aldo Cortesi" diff --git a/doc-src/ssl.html b/doc-src/ssl.html index 68e9a57c..c904cf61 100644 --- a/doc-src/ssl.html +++ b/doc-src/ssl.html @@ -34,6 +34,23 @@ testing system or browser to trust the __mitmproxy__ CA as a signing root authority. +Using a custom certificate +-------------------------- + +You can use your own certificate by passing the __--cert__ option to mitmproxy. + +The certificate file is expected to be in the PEM format. You can generate +a certificate in this format using these instructions: + +<pre class="terminal"> +> openssl genrsa -out cert.key 8192 +> openssl req -new -x509 -key cert.key -out cert.crt + (Specify the mitm domain as Common Name, e.g. *.google.com) +> cat cert.key cert.crt > cert.pem +> mitmproxy --cert=cert.pem +</pre> + + Installing the mitmproxy CA --------------------------- |