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

Unified Diff: chromeos/network/onc/onc_certificate_importer.h

Issue 11970012: Add a check for server and CA certificates in device policies to the ONC validator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixing unit tests. Created 7 years, 11 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
« no previous file with comments | « chromeos/docs/onc_spec.html ('k') | chromeos/network/onc/onc_certificate_importer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/onc/onc_certificate_importer.h
diff --git a/chromeos/network/onc/onc_certificate_importer.h b/chromeos/network/onc/onc_certificate_importer.h
index 1fed94117d231b89e7de613151cb7c1a3edac516..5eddbb776285aa68e94b31ec45e71fb8592980e0 100644
--- a/chromeos/network/onc/onc_certificate_importer.h
+++ b/chromeos/network/onc/onc_certificate_importer.h
@@ -38,11 +38,11 @@ class CHROMEOS_EXPORT CertificateImporter {
IMPORT_FAILED,
};
- // Certificates pushed from a policy source with Web trust are only imported
- // with ParseCertificate() if the |allow_web_trust_from_policy| permission is
- // granted.
- CertificateImporter(ONCSource onc_source,
- bool allow_web_trust_from_policy);
+ // During import with ParseCertificate(), Web trust is only applied to Server
+ // and Authority certificates with the Trust attribute "Web" if the
+ // |allow_web_trust| permission is granted, otherwise the attribute is
+ // ignored.
+ explicit CertificateImporter(bool allow_web_trust);
// Parses and stores the certificates in |onc_certificates| into the
// certificate store. If the "Remove" field of a certificate is enabled, then
@@ -75,12 +75,9 @@ class CHROMEOS_EXPORT CertificateImporter {
bool ParseClientCertificate(const std::string& guid,
const base::DictionaryValue& certificate);
- // Where the ONC blob comes from.
- ONCSource onc_source_;
-
- // Whether certificates with Web trust should be stored when pushed from a
- // policy source.
- bool allow_web_trust_from_policy_;
+ // Whether certificates with Trust attribute "Web" should be stored with web
+ // trust.
+ bool allow_web_trust_;
DISALLOW_COPY_AND_ASSIGN(CertificateImporter);
};
« no previous file with comments | « chromeos/docs/onc_spec.html ('k') | chromeos/network/onc/onc_certificate_importer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698