Hook up Chrome Cast sender to Cast CRL.

components/cast_certificate/cast_cert_validator.cc

 // Copyright 2014 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 "components/cast_certificate/cast_cert_validator.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 237 matching lines @@
   // INTEGER (non-minimal encoding).
   //
   // Allow these sorts of serial numbers.
   //
   // TODO(eroman): At some point in the future this workaround will no longer be
   // necessary. Should revisit this for removal in 2017 if not earlier.
   options.allow_invalid_serial_numbers = true;
   return options;
 }
 
-// Verifies a cast device certificate given a chain of DER-encoded certificates.
+}  // namespace
+
 bool VerifyDeviceCert(const std::vector<std::string>& certs,
                       const base::Time& time,
                       std::unique_ptr<CertVerificationContext>* context,
                       CastDeviceCertPolicy* policy,
                       const CastCRL* crl,
-                      CRLPolicy crl_policy,
-                      net::TrustStore* trust_store) {
+                      CRLPolicy crl_policy) {
+  return VerifyDeviceCertUsingCustomTrustStore(
+      certs, time, context, policy, crl, crl_policy, &CastTrustStore::Get());
+}
+
+bool VerifyDeviceCertUsingCustomTrustStore(
+    const std::vector<std::string>& certs,
+    const base::Time& time,
+    std::unique_ptr<CertVerificationContext>* context,
+    CastDeviceCertPolicy* policy,
+    const CastCRL* crl,
+    CRLPolicy crl_policy,
+    net::TrustStore* trust_store) {
+  if (!trust_store)
+    return VerifyDeviceCert(certs, time, context, policy, crl, crl_policy);
+
   if (certs.empty())
     return false;
 
   net::CertErrors errors;
   scoped_refptr<net::ParsedCertificate> target_cert;
   net::CertIssuerSourceStatic intermediate_cert_issuer_source;
   for (size_t i = 0; i < certs.size(); ++i) {
     scoped_refptr<net::ParsedCertificate> cert(net::ParsedCertificate::Create(
         certs[i], GetCertParsingOptions(), &errors));
     // TODO(eroman): Propagate/log these parsing errors.
@@ skipping 37 matching lines @@
       return false;
     }
   } else {
     if (!crl->CheckRevocation(result.GetBestValidPath()->path, time)) {
       return false;
     }
   }
   return true;
 }
 
-}  // namespace
-
-bool VerifyDeviceCert(const std::vector<std::string>& certs,
-                      const base::Time& time,
-                      std::unique_ptr<CertVerificationContext>* context,
-                      CastDeviceCertPolicy* policy,
-                      const CastCRL* crl,
-                      CRLPolicy crl_policy) {
-  return VerifyDeviceCert(certs, time, context, policy, crl, crl_policy,
-                          &CastTrustStore::Get());
-}
-
-bool VerifyDeviceCertForTest(const std::vector<std::string>& certs,
-                             const base::Time& time,
-                             std::unique_ptr<CertVerificationContext>* context,
-                             CastDeviceCertPolicy* policy,
-                             const CastCRL* crl,
-                             CRLPolicy crl_policy,
-                             net::TrustStore* trust_store) {
-  return VerifyDeviceCert(certs, time, context, policy, crl, crl_policy,
-                          trust_store);
-}
-
 std::unique_ptr<CertVerificationContext> CertVerificationContextImplForTest(
     const base::StringPiece& spki) {
   // Use a bogus CommonName, since this is just exposed for testing signature
   // verification by unittests.
   return base::MakeUnique<CertVerificationContextImpl>(net::der::Input(spki),
                                                        "CommonName");
 }
 
 }  // namespace cast_certificate