Index: components/cast_certificate/cast_cert_validator.h |
diff --git a/components/cast_certificate/cast_cert_validator.h b/components/cast_certificate/cast_cert_validator.h |
index a918dd582070f1c496f7e40120922f3f46669e02..d54c34bdcf79bdf5cb0f49f3e91a1ac616295607 100644 |
--- a/components/cast_certificate/cast_cert_validator.h |
+++ b/components/cast_certificate/cast_cert_validator.h |
@@ -78,8 +78,8 @@ class CertVerificationContext { |
// * |crl| is the CRL to check for certificate revocation status. |
// If this is a nullptr, then revocation checking is currently disabled. |
// |
-// * |crl_options| is for choosing how to handle the absence of a CRL. |
-// If crl_required is set to true, then an empty |crl| input would result |
+// * |crl_policy| is for choosing how to handle the absence of a CRL. |
+// If CRL_REQUIRED is passed, then an empty |crl| input would result |
// in a failed verification. Otherwise, |crl| is ignored if it is absent. |
// |
// Outputs: |
@@ -99,17 +99,19 @@ bool VerifyDeviceCert(const std::vector<std::string>& certs, |
const CastCRL* crl, |
CRLPolicy crl_policy) WARN_UNUSED_RESULT; |
-// Exposed only for testing, not for use in production code. |
-// |
// This is an overloaded version of VerifyDeviceCert that allows |
-// the input of a custom TrustStore. |
-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) WARN_UNUSED_RESULT; |
+// the input of a custom TrustStore. |trust_store| must not be nullptr. |
+// |
+// For production use pass |trust_store| as nullptr to use the production trust |
eroman
2016/09/17 00:44:41
This comment disagrees with above comment (and imp
ryanchung
2016/09/22 21:38:51
Done. Allowing nullptr to be passed.
|
+// 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) WARN_UNUSED_RESULT; |
// Exposed only for unit-tests, not for use in production code. |
// Production code would get a context from VerifyDeviceCert(). |