Chromium Code Reviews| 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 e08eae7fb8ff6fcbe020113ff3731c8e9b5b1cfe..d8b63f943e65d5a7d18a67769b95f4acc82141cc 100644 |
| --- a/components/cast_certificate/cast_cert_validator.cc |
| +++ b/components/cast_certificate/cast_cert_validator.cc |
| @@ -255,13 +255,13 @@ net::ParseCertificateOptions GetCertParsingOptions() { |
| } |
| // Verifies a cast device certficate given a chain of DER-encoded certificates. |
| -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) { |
| +bool VerifyDeviceCertImpl(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 (certs.empty()) |
| return false; |
| @@ -333,19 +333,22 @@ bool VerifyDeviceCert(const std::vector<std::string>& certs, |
| CastDeviceCertPolicy* policy, |
| const CastCRL* crl, |
| CRLPolicy crl_policy) { |
| - return VerifyDeviceCert(certs, time, context, policy, crl, crl_policy, |
| - &CastTrustStore::Get()); |
| + return VerifyDeviceCertImpl(certs, time, context, policy, crl, crl_policy, |
|
sheretov
2016/09/10 00:26:57
Same comment as in cast_crl.cc: seems like we coul
ryanchung
2016/09/10 00:50:09
Done.
|
| + &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); |
| +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 false; |
| + return VerifyDeviceCertImpl(certs, time, context, policy, crl, crl_policy, |
| + trust_store); |
| } |
| std::unique_ptr<CertVerificationContext> CertVerificationContextImplForTest( |