From 6e89efe5aa05e8284006a7a95e25bff83d7bcd1e Mon Sep 17 00:00:00 2001 From: Kevin Harwood Date: Wed, 21 Oct 2015 08:48:21 -0500 Subject: [PATCH] Cherry-picked change from #3063 --- AFNetworking/AFSecurityPolicy.m | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/AFNetworking/AFSecurityPolicy.m b/AFNetworking/AFSecurityPolicy.m index 91f2026cc0..b014d75b16 100644 --- a/AFNetworking/AFSecurityPolicy.m +++ b/AFNetworking/AFSecurityPolicy.m @@ -259,11 +259,7 @@ - (BOOL)evaluateServerTrust:(SecTrustRef)serverTrust SecTrustSetPolicies(serverTrust, (__bridge CFArrayRef)policies); if (self.SSLPinningMode == AFSSLPinningModeNone) { - if (self.allowInvalidCertificates || AFServerTrustIsValid(serverTrust)){ - return YES; - } else { - return NO; - } + return self.allowInvalidCertificates || AFServerTrustIsValid(serverTrust); } else if (!AFServerTrustIsValid(serverTrust) && !self.allowInvalidCertificates) { return NO; }