aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Kriechbaumer <Kriechi@users.noreply.github.com>2017-12-21 10:09:02 +0100
committerGitHub <noreply@github.com>2017-12-21 10:09:02 +0100
commit19268d56664900a07fe1aa9e87e939943453fdb0 (patch)
treeaf3692a00c7113341caaf21cb719c076f74163e9
parenta6a4b1c33bb34ceac4bc7e7e1979d6b52b47c28c (diff)
parentb19eb333d350ad680e4df8764220bbb78a40d004 (diff)
downloadmitmproxy-19268d56664900a07fe1aa9e87e939943453fdb0.tar.gz
mitmproxy-19268d56664900a07fe1aa9e87e939943453fdb0.tar.bz2
mitmproxy-19268d56664900a07fe1aa9e87e939943453fdb0.zip
Merge pull request #2710 from jimhigson/update-ios-instructions
Move trust instructions for ios
-rw-r--r--docs/certinstall.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/certinstall.rst b/docs/certinstall.rst
index 2ec5f022..6662e34d 100644
--- a/docs/certinstall.rst
+++ b/docs/certinstall.rst
@@ -24,10 +24,6 @@ something like this:
Click on the relevant icon, follow the setup instructions for the platform
you're on and you are good to go.
-For iOS version 10.3 or up, you need to make sure ``mitmproxy`` is enabled in
-``Certificate Trust Settings``, you can check it by going to
-``Settings > General > About > Certificate Trust Settings``.
-
Installing the mitmproxy CA certificate manually
------------------------------------------------
@@ -39,7 +35,6 @@ 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
^^^
@@ -47,6 +42,11 @@ See http://jasdev.me/intercepting-ios-traffic
and https://web.archive.org/web/20150920082614/http://kb.mit.edu/confluence/pages/viewpage.action?pageId=152600377
+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.
+2. Under "Enable full trust for root certificates", turn on trust for the mitmproxy certificate.
+
iOS Simulator
^^^^^^^^^^^^^