diff options
| author | Aldo Cortesi <aldo@corte.si> | 2018-05-10 17:30:49 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-10 17:30:49 +1200 |
| commit | ab89079c65272a9a2ef4f98d38d0ed39468bc876 (patch) | |
| tree | 340375b07b4ce7de5e4b4c2d0c98fa4d18edee21 /docs/src | |
| parent | 0c101a4bccfb8460a11691cc17467d47d1974b2f (diff) | |
| parent | 8c63a8818d6e66c5b1e32e30d785d8d4a3bc233c (diff) | |
| download | mitmproxy-ab89079c65272a9a2ef4f98d38d0ed39468bc876.tar.gz mitmproxy-ab89079c65272a9a2ef4f98d38d0ed39468bc876.tar.bz2 mitmproxy-ab89079c65272a9a2ef4f98d38d0ed39468bc876.zip | |
Merge pull request #3109 from cortesi/kmap
console keybindings: define a yaml format, load CONFDIR/keys.yaml on startup
Diffstat (limited to 'docs/src')
| -rw-r--r-- | docs/src/content/concepts-certificates.md | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/src/content/concepts-certificates.md b/docs/src/content/concepts-certificates.md index d7f53127..1dcb2f97 100644 --- a/docs/src/content/concepts-certificates.md +++ b/docs/src/content/concepts-certificates.md @@ -32,7 +32,7 @@ reason. Below is a list of pointers to manual certificate installation documentation for some common platforms. The mitmproxy CA cert is located in `~/.mitmproxy` after it has been generated at the first start of mitmproxy. -- [IOS](http://jasdev.me/intercepting-ios-traffic) +- [IOS](http://jasdev.me/intercepting-ios-traffic) On iOS 10.3 and onwards, you also need to enable full trust for the mitmproxy root certificate: 1. Go to Settings > General > About > Certificate Trust Settings. @@ -42,12 +42,12 @@ documentation for some common platforms. The mitmproxy CA cert is located in - [Java](https://docs.oracle.com/cd/E19906-01/820-4916/geygn/index.html) - [Android/Android Simulator](http://wiki.cacert.org/FAQ/ImportRootCert#Android_Phones_.26_Tablets) - [Windows](https://web.archive.org/web/20160612045445/http://windows.microsoft.com/en-ca/windows/import-export-certificates-private-keys#1TC=windows-7) -- [Windows (automated)](https://technet.microsoft.com/en-us/library/cc732443.aspx) +- [Windows (automated)](https://technet.microsoft.com/en-us/library/cc732443.aspx) {{< highlight bash >}} certutil.exe -importpfx Root mitmproxy-ca-cert.p12 {{< / highlight >}} - + - [Mac OS X](https://support.apple.com/kb/PH20129) - [Ubuntu/Debian]( https://askubuntu.com/questions/73287/how-do-i-install-a-root-certificate/94861#94861) - [Mozilla Firefox](https://wiki.mozilla.org/MozillaRootCertificate#Mozilla_Firefox) @@ -143,7 +143,7 @@ mitmproxy --cert *.example.com=cert.pem By default, mitmproxy will use `~/.mitmproxy/mitmproxy-ca.pem` as the certificate authority to generate certificates for all domains for which no custom certificate is provided (see above). You can use your own -certificate authority by passing the `--set cadir=DIRECTORY` option to +certificate authority by passing the `--set confdir=DIRECTORY` option to mitmproxy. Mitmproxy will then look for `mitmproxy-ca.pem` in the specified directory. If no such file exists, it will be generated automatically. |