[ios] Removed CertVerifierBlockAdapter.

net/cert/cert_verify_proc_ios.cc

 // Copyright (c) 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/cert/cert_verify_proc_ios.h"
 
 #include <CommonCrypto/CommonDigest.h>
-#include <Security/Security.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "crypto/sha2.h"
 #include "net/base/net_errors.h"
 #include "net/cert/asn1_util.h"
 #include "net/cert/cert_verify_result.h"
 #include "net/cert/test_root_certs.h"
 #include "net/cert/x509_certificate.h"
 #include "net/ssl/openssl_ssl_util.h"
@@ skipping 146 matching lines @@
   }
   if (!verified_cert) {
     NOTREACHED();
     return;
   }
 
   verify_result->verified_cert =
       X509Certificate::CreateFromHandle(verified_cert, verified_chain);
 }
 
+}  // namespace
+
+CertVerifyProcIOS::CertVerifyProcIOS() {}
+
+CertVerifyProcIOS::~CertVerifyProcIOS() {}

[Ryan Sleevi, 2016/08/12 00:16:23]

This (the dtor) should not be moved. Declaration and definition order should be
kept in sync. The old code was buggy too, but more apparent here :)

You can also = default; these, rather than {}

[Eugene But (OOO till 7-30), 2016/08/12 16:16:40]

Moved to the bottom.

+
 // The iOS APIs don't expose an API-stable set of reasons for certificate
 // validation failures. However, internally, the reason is tracked, and it's
 // converted to user-facing localized strings.
 //
 // In the absence of a consistent API, convert the English strings to their
 // localized counterpart, and then compare that with the error properties. If
 // they're equal, it's a strong sign that this was the cause for the error.
 // While this will break if/when iOS changes the contents of these strings,
 // it's sufficient enough for now.
 //
 // TODO(rsleevi): https://crbug.com/601915 - Use a less brittle solution when
 // possible.
-CertStatus GetFailureFromTrustProperties(CFArrayRef properties) {
+// static
+CertStatus CertVerifyProcIOS::GetCertFailureStatusFromTrust(SecTrustRef trust) {
   CertStatus reason = 0;
 
+  base::ScopedCFTypeRef<CFArrayRef> properties(SecTrustCopyProperties(trust));
   if (!properties)
     return CERT_STATUS_INVALID;
 
   const CFIndex properties_length = CFArrayGetCount(properties);
   if (properties_length == 0)
     return CERT_STATUS_INVALID;
 
   CFBundleRef bundle =
       CFBundleGetBundleWithIdentifier(CFSTR("com.apple.Security"));
   CFStringRef date_string =
@@ skipping 21 matching lines @@
     } else if (CFEqual(error, weak_error)) {
       reason |= CERT_STATUS_WEAK_KEY;
     } else {
       reason |= CERT_STATUS_INVALID;
     }
   }
 
   return reason;
 }
 
-}  // namespace
-
-CertVerifyProcIOS::CertVerifyProcIOS() {}
-
-CertVerifyProcIOS::~CertVerifyProcIOS() {}
-
 bool CertVerifyProcIOS::SupportsAdditionalTrustAnchors() const {
   return false;
 }
 
 bool CertVerifyProcIOS::SupportsOCSPStapling() const {
   return false;
 }
 
 int CertVerifyProcIOS::VerifyInternal(
     X509Certificate* cert,
@@ skipping 24 matching lines @@
 
   // TODO(sleevi): Support CRLSet revocation.
   switch (trust_result) {
     case kSecTrustResultUnspecified:
     case kSecTrustResultProceed:
       break;
     case kSecTrustResultDeny:
       verify_result->cert_status |= CERT_STATUS_AUTHORITY_INVALID;
       break;
     default:
-      ScopedCFTypeRef<CFArrayRef> properties(SecTrustCopyProperties(trust_ref));
-      verify_result->cert_status |= GetFailureFromTrustProperties(properties);
+      verify_result->cert_status |= GetCertFailureStatusFromTrust(trust_ref);
   }
 
   GetCertChainInfo(final_chain, verify_result);
 
   // Perform hostname verification independent of SecTrustEvaluate.
   if (!verify_result->verified_cert->VerifyNameMatch(
           hostname, &verify_result->common_name_fallback_used)) {
     verify_result->cert_status |= CERT_STATUS_COMMON_NAME_INVALID;
   }
 
   verify_result->is_issued_by_known_root = false;
 
   if (IsCertStatusError(verify_result->cert_status))
     return MapCertStatusToNetError(verify_result->cert_status);
 
   return OK;
 }
 
 }  // namespace net