From 9c23a1955cd54b4b748a266efdefe0fd08c236a6 Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Wed, 21 Aug 2013 13:35:18 -0700 Subject: [PATCH] Revert "When AFNetworking is in an embedded framework, load certificates from all non-framework bundles" This reverts commit ad0d0cd46e5859050196a0b0984efd63b6bd0c28. --- AFNetworking/AFURLConnectionOperation.m | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/AFNetworking/AFURLConnectionOperation.m b/AFNetworking/AFURLConnectionOperation.m index dbc59a1..6de15a6 100644 --- a/AFNetworking/AFURLConnectionOperation.m +++ b/AFNetworking/AFURLConnectionOperation.m @@ -200,13 +200,13 @@ static BOOL AFSecKeyIsEqualToKey(SecKeyRef key1, SecKeyRef key2) { static NSArray *_pinnedCertificates = nil; static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ - NSMutableArray *certificates = [NSMutableArray array]; - for (NSBundle *bundle in [NSBundle allBundles]) { - NSArray *paths = [bundle pathsForResourcesOfType:@"cer" inDirectory:@"."]; - for (NSString *path in paths) { - NSData *certificateData = [NSData dataWithContentsOfFile:path]; - [certificates addObject:certificateData]; - } + NSBundle *bundle = [NSBundle mainBundle]; + NSArray *paths = [bundle pathsForResourcesOfType:@"cer" inDirectory:@"."]; + + NSMutableArray *certificates = [NSMutableArray arrayWithCapacity:[paths count]]; + for (NSString *path in paths) { + NSData *certificateData = [NSData dataWithContentsOfFile:path]; + [certificates addObject:certificateData]; } _pinnedCertificates = [[NSArray alloc] initWithArray:certificates];