Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(201)

Unified Diff: components/cast_certificate/cast_cert_validator.cc

Issue 2303673004: Hook up Chrome Cast sender to Cast CRL. (Closed)
Patch Set: Cleaned up unused headers. Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..833dbf1285d7723062e66228159520dc2d40376a 100644
--- a/components/cast_certificate/cast_cert_validator.cc
+++ b/components/cast_certificate/cast_cert_validator.cc
@@ -254,14 +254,20 @@ net::ParseCertificateOptions GetCertParsingOptions() {
return options;
}
+} // namespace
+
// 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 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;
+
if (certs.empty())
return false;
@@ -325,27 +331,14 @@ 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);
+ return VerifyDeviceCertUsingCustomTrustStore(
+ certs, time, context, policy, crl, crl_policy, &CastTrustStore::Get());
}
std::unique_ptr<CertVerificationContext> CertVerificationContextImplForTest(

Powered by Google App Engine
This is Rietveld 408576698