| 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..649a14ab1e2f81ea89564be71dbc1d38306a3f4d 100644
|
| --- a/components/cast_certificate/cast_cert_validator.cc
|
| +++ b/components/cast_certificate/cast_cert_validator.cc
|
| @@ -263,6 +263,9 @@ bool VerifyDeviceCert(const std::vector<std::string>& certs,
|
| const CastCRL* crl,
|
| CRLPolicy crl_policy,
|
| net::TrustStore* trust_store) {
|
| + if (!trust_store)
|
| + return false;
|
| +
|
| if (certs.empty())
|
| return false;
|
|
|
| @@ -332,13 +335,16 @@ bool VerifyDeviceCert(const std::vector<std::string>& certs,
|
| &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) {
|
| +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);
|
| return VerifyDeviceCert(certs, time, context, policy, crl, crl_policy,
|
| trust_store);
|
| }
|
|
|