浏览代码

Switched server trust host validation over to use SSL policy evaluation.

Christian Noon 10 年之前
父节点
当前提交
001c03dd55
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      Source/ServerTrustPolicy.swift

+ 3 - 3
Source/ServerTrustPolicy.swift

@@ -163,13 +163,13 @@ public enum ServerTrustPolicy {
 
         switch self {
         case let .PerformDefaultEvaluation(validateHost):
-            let policy = validateHost ? SecPolicyCreateSSL(true, host as CFString) : SecPolicyCreateBasicX509()
+            let policy = SecPolicyCreateSSL(true, validateHost ? host as CFString : nil)
             SecTrustSetPolicies(serverTrust, [policy])
 
             serverTrustIsValid = trustIsValid(serverTrust)
         case let .PinCertificates(pinnedCertificates, validateCertificateChain, validateHost):
             if validateCertificateChain {
-                let policy = validateHost ? SecPolicyCreateSSL(true, host as CFString) : SecPolicyCreateBasicX509()
+                let policy = SecPolicyCreateSSL(true, validateHost ? host as CFString : nil)
                 SecTrustSetPolicies(serverTrust, [policy])
 
                 SecTrustSetAnchorCertificates(serverTrust, pinnedCertificates)
@@ -200,7 +200,7 @@ public enum ServerTrustPolicy {
             var certificateChainEvaluationPassed = true
 
             if validateCertificateChain {
-                let policy = validateHost ? SecPolicyCreateSSL(true, host as CFString) : SecPolicyCreateBasicX509()
+                let policy = SecPolicyCreateSSL(true, validateHost ? host as CFString : nil)
                 SecTrustSetPolicies(serverTrust, [policy])
 
                 certificateChainEvaluationPassed = trustIsValid(serverTrust)