evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Now using errSecSuccess instead of noErr for Security frameworks OSStatus.

Browse source
This commit is contained in:
Oliver Letterer 2013-04-08 14:04:08 +02:00
parent 24dd68fa6e
commit ecbe8166cd
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
AFNetworking/AFURLConnectionOperation.m
View file

@ -216,11 +216,11 @@ static inline BOOL AFStateTransitionIsValid(AFOperationState fromState, AFOperat
SecPolicyRef policy = SecPolicyCreateBasicX509(); SecPolicyRef policy = SecPolicyCreateBasicX509();
SecTrustRef allowedTrust = NULL; SecTrustRef allowedTrust = NULL;
OSStatus status = SecTrustCreateWithCertificates(certificates, policy, &allowedTrust); OSStatus status = SecTrustCreateWithCertificates(certificates, policy, &allowedTrust);
NSAssert(status == noErr, @"SecTrustCreateWithCertificates error: %ld", (long int)status); NSAssert(status == errSecSuccess, @"SecTrustCreateWithCertificates error: %ld", (long int)status);
SecTrustResultType result = 0; SecTrustResultType result = 0;
status = SecTrustEvaluate(allowedTrust, &result); status = SecTrustEvaluate(allowedTrust, &result);
NSAssert(status == noErr, @"SecTrustEvaluate error: %ld", (long int)status); NSAssert(status == errSecSuccess, @"SecTrustEvaluate error: %ld", (long int)status);
SecKeyRef allowedPublicKey = SecTrustCopyPublicKey(allowedTrust); SecKeyRef allowedPublicKey = SecTrustCopyPublicKey(allowedTrust);
NSCParameterAssert(allowedPublicKey); NSCParameterAssert(allowedPublicKey);
@ -565,11 +565,11 @@ willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challe
SecTrustRef trust = NULL; SecTrustRef trust = NULL;
OSStatus status = SecTrustCreateWithCertificates(certificates, policy, &trust); OSStatus status = SecTrustCreateWithCertificates(certificates, policy, &trust);
NSAssert(status == noErr, @"SecTrustCreateWithCertificates error: %ld", (long int)status); NSAssert(status == errSecSuccess, @"SecTrustCreateWithCertificates error: %ld", (long int)status);
SecTrustResultType result; SecTrustResultType result;
status = SecTrustEvaluate(trust, &result); status = SecTrustEvaluate(trust, &result);
NSAssert(status == noErr, @"SecTrustEvaluate error: %ld", (long int)status); NSAssert(status == errSecSuccess, @"SecTrustEvaluate error: %ld", (long int)status);
[trustChain addObject:(__bridge_transfer id)SecTrustCopyPublicKey(trust)]; [trustChain addObject:(__bridge_transfer id)SecTrustCopyPublicKey(trust)];
@ -612,7 +612,7 @@ willSendRequestForAuthenticationChallenge:(NSURLAuthenticationChallenge *)challe
#else #else
SecTrustResultType result = 0; SecTrustResultType result = 0;
OSStatus status = SecTrustEvaluate(serverTrust, &result); OSStatus status = SecTrustEvaluate(serverTrust, &result);
NSAssert(status == noErr, @"SecTrustEvaluate error: %ld", (long int)status); NSAssert(status == errSecSuccess, @"SecTrustEvaluate error: %ld", (long int)status);
if (result == kSecTrustResultUnspecified || result == kSecTrustResultProceed) { if (result == kSecTrustResultUnspecified || result == kSecTrustResultProceed) {
NSURLCredential *credential = [NSURLCredential credentialForTrust:serverTrust]; NSURLCredential *credential = [NSURLCredential credentialForTrust:serverTrust];