| Index: components/cast_certificate/cast_cert_validator.cc
|
| diff --git a/components/cast_certificate/cast_cert_validator.cc b/components/cast_certificate/cast_cert_validator.cc
|
| index 5cbf9bf896f66a7b4066e77591f742fc58ef16c2..bcd0a86288781ac14428c2858218050a98dd4a12 100644
|
| --- a/components/cast_certificate/cast_cert_validator.cc
|
| +++ b/components/cast_certificate/cast_cert_validator.cc
|
| @@ -255,14 +255,29 @@ net::ParseCertificateOptions GetCertParsingOptions() {
|
| 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;
|
|
|
| @@ -320,29 +335,6 @@ bool VerifyDeviceCert(const std::vector<std::string>& certs,
|
| 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
|
|
|