From 459ab007f4a806895cd204ed84d2643766a2ea7e Mon Sep 17 00:00:00 2001 From: Alban Diquet Date: Sun, 2 Aug 2015 12:31:26 -0700 Subject: [PATCH 1/2] Tweak authors file --- AUTHORS | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 36a266fb..34c08cb7 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,5 +1,13 @@ -Original Authors ----------------- +Authors +------- Alban Diquet - Data Theorem Inc. Angela Chow - Yahoo Inc. Eric Castro - Data Theorem Inc. + + +Thanks +------ +Daryl Low - Yahoo Inc. +Christopher Harrell - Yahoo Inc. +Plasma Chen - Yahoo Inc. + From cebf51f6dabb5b4c3f5260632bfc64680176227f Mon Sep 17 00:00:00 2001 From: Alban Diquet Date: Sun, 2 Aug 2015 12:38:28 -0700 Subject: [PATCH 2/2] Update README --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 96657c4d..8f1c84e7 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,13 @@ Sample Usage ------------ Enabling SSL pinning only requires initializing TrustKit with a pinning policy -(domains, Subject Public Key Info hashes, and additional settings): +(domains, Subject Public Key Info hashes, and additional settings). + +The policy can be configured within the App's Info.plist: + +![Info.plist policy](https://datatheorem.github.io/TrustKit/images/linking3_dynamic.png) + +Alternatively, the pinning policy can be set programmatically: NSDictionary *trustKitConfig; trustKitConfig = @{