Merge branch 'master' into invalid-ssl

Author: kcharwood

AFNetworking/AFURLConnectionOperation.m

@@ -208,22 +208,22 @@ + (NSArray *)pinnedPublicKeys {
 
         for (NSData *data in pinnedCertificates) {
             SecCertificateRef allowedCertificate = SecCertificateCreateWithData(NULL, (__bridge CFDataRef)data);
-            NSCParameterAssert(allowedCertificate);
+            NSParameterAssert(allowedCertificate);
 
             SecCertificateRef allowedCertificates[] = {allowedCertificate};
             CFArrayRef certificates = CFArrayCreate(NULL, (const void **)allowedCertificates, 1, NULL);
 
             SecPolicyRef policy = SecPolicyCreateBasicX509();
             SecTrustRef allowedTrust = NULL;
             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;
             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);            
-            NSCParameterAssert(allowedPublicKey);
+            NSParameterAssert(allowedPublicKey);
             [publicKeys addObject:(__bridge_transfer id)allowedPublicKey];
 
             CFRelease(allowedTrust);
@@ -570,11 +570,11 @@ - (void)connection:(NSURLConnection *)connection
                 SecTrustRef trust = NULL;
 
                 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;
                 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)];