From 4c4ca960174ddd90d4e67f4a4a3476840b18c216 Mon Sep 17 00:00:00 2001 From: jimhigson Date: Mon, 18 Dec 2017 18:28:02 +0000 Subject: [PATCH 1/2] move extra info for ios to ios section --- docs/certinstall.rst | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/docs/certinstall.rst b/docs/certinstall.rst index 2ec5f022f..446f74fdf 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,14 @@ 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 mitm root certificate after installing from http://mitm.it + +1. Open the Settings app +2. Tap General +3. Tap About +4. Scroll to bottom. Tap Certificate Trust Settings +5. Turn on the switch for mitmproxy + iOS Simulator ^^^^^^^^^^^^^ From b19eb333d350ad680e4df8764220bbb78a40d004 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 18 Dec 2017 20:00:19 +0100 Subject: [PATCH 2/2] minor docs improvements 1. The way the certificate is installed (mitm.it or not) does not matter. 2. Instructions are a bit shorter now and match those provided by Apple at https://support.apple.com/en-us/HT204477. --- docs/certinstall.rst | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/certinstall.rst b/docs/certinstall.rst index 446f74fdf..6662e34dc 100644 --- a/docs/certinstall.rst +++ b/docs/certinstall.rst @@ -42,13 +42,10 @@ 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 mitm root certificate after installing from http://mitm.it +On iOS 10.3 and onwards, you also need to enable full trust for the mitmproxy root certificate: -1. Open the Settings app -2. Tap General -3. Tap About -4. Scroll to bottom. Tap Certificate Trust Settings -5. Turn on the switch for mitmproxy +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 ^^^^^^^^^^^^^