瀏覽代碼

Removed ambiguous array creation. According to documentation SecTrustCreateWithCertificates takes SecCertificateRef object or an array of certificates.

Maksym Shcheglov 9 年之前
父節點
當前提交
9fea2240a8
共有 1 個文件被更改,包括 1 次插入10 次删除
  1. 1 10
      AFNetworking/AFSecurityPolicy.m

+ 1 - 10
AFNetworking/AFSecurityPolicy.m

@@ -51,8 +51,6 @@ static BOOL AFSecKeyIsEqualToKey(SecKeyRef key1, SecKeyRef key2) {
 static id AFPublicKeyForCertificate(NSData *certificate) {
     id allowedPublicKey = nil;
     SecCertificateRef allowedCertificate;
-    SecCertificateRef allowedCertificates[1];
-    CFArrayRef tempCertificates = nil;
     SecPolicyRef policy = nil;
     SecTrustRef allowedTrust = nil;
     SecTrustResultType result;
@@ -60,11 +58,8 @@ static id AFPublicKeyForCertificate(NSData *certificate) {
     allowedCertificate = SecCertificateCreateWithData(NULL, (__bridge CFDataRef)certificate);
     __Require_Quiet(allowedCertificate != NULL, _out);
 
-    allowedCertificates[0] = allowedCertificate;
-    tempCertificates = CFArrayCreate(NULL, (const void **)allowedCertificates, 1, NULL);
-
     policy = SecPolicyCreateBasicX509();
-    __Require_noErr_Quiet(SecTrustCreateWithCertificates(tempCertificates, policy, &allowedTrust), _out);
+    __Require_noErr_Quiet(SecTrustCreateWithCertificates(allowedCertificate, policy, &allowedTrust), _out);
     __Require_noErr_Quiet(SecTrustEvaluate(allowedTrust, &result), _out);
 
     allowedPublicKey = (__bridge_transfer id)SecTrustCopyPublicKey(allowedTrust);
@@ -78,10 +73,6 @@ _out:
         CFRelease(policy);
     }
 
-    if (tempCertificates) {
-        CFRelease(tempCertificates);
-    }
-
     if (allowedCertificate) {
         CFRelease(allowedCertificate);
     }