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

Side by Side Diff: chromeos/network/onc/onc_certificate_importer.h

Issue 13473003: Rename ONC field Trust to TrustBits. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/docs/onc_spec.html ('k') | chromeos/network/onc/onc_certificate_importer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_H_ 5 #ifndef CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_H_
6 #define CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_H_ 6 #define CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_H_
7 7
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 21 matching lines...) Expand all
32 // is stored together with the certificate as Nickname. 32 // is stored together with the certificate as Nickname.
33 class CHROMEOS_EXPORT CertificateImporter { 33 class CHROMEOS_EXPORT CertificateImporter {
34 public: 34 public:
35 enum ParseResult { 35 enum ParseResult {
36 IMPORT_OK, 36 IMPORT_OK,
37 IMPORT_INCOMPLETE, 37 IMPORT_INCOMPLETE,
38 IMPORT_FAILED, 38 IMPORT_FAILED,
39 }; 39 };
40 40
41 // During import with ParseCertificate(), Web trust is only applied to Server 41 // During import with ParseCertificate(), Web trust is only applied to Server
42 // and Authority certificates with the Trust attribute "Web" if the 42 // and Authority certificates with the TrustBits attribute "Web" if the
43 // |allow_trust_imports| permission is granted, otherwise the attribute is 43 // |allow_trust_imports| permission is granted, otherwise the attribute is
44 // ignored. 44 // ignored.
45 explicit CertificateImporter(bool allow_trust_imports); 45 explicit CertificateImporter(bool allow_trust_imports);
46 46
47 // Parses and stores the certificates in |onc_certificates| into the 47 // Parses and stores the certificates in |onc_certificates| into the
48 // certificate store. If the "Remove" field of a certificate is enabled, then 48 // certificate store. If the "Remove" field of a certificate is enabled, then
49 // removes the certificate from the store instead of importing. Returns the 49 // removes the certificate from the store instead of importing. Returns the
50 // result of the parse operation. In case of IMPORT_INCOMPLETE, some of the 50 // result of the parse operation. In case of IMPORT_INCOMPLETE, some of the
51 // certificates may be stored/removed successfully while others had errors. 51 // certificates may be stored/removed successfully while others had errors.
52 // If |onc_trusted_certificates| is not NULL then it will be filled with the 52 // If |onc_trusted_certificates| is not NULL then it will be filled with the
(...skipping 22 matching lines...) Expand all
75 75
76 bool ParseServerOrCaCertificate( 76 bool ParseServerOrCaCertificate(
77 const std::string& cert_type, 77 const std::string& cert_type,
78 const std::string& guid, 78 const std::string& guid,
79 const base::DictionaryValue& certificate, 79 const base::DictionaryValue& certificate,
80 net::CertificateList* onc_trusted_certificates); 80 net::CertificateList* onc_trusted_certificates);
81 81
82 bool ParseClientCertificate(const std::string& guid, 82 bool ParseClientCertificate(const std::string& guid,
83 const base::DictionaryValue& certificate); 83 const base::DictionaryValue& certificate);
84 84
85 // Whether certificates with Trust attribute "Web" should be stored with web 85 // Whether certificates with TrustBits attribute "Web" should be stored with
86 // trust. 86 // web trust.
87 bool allow_trust_imports_; 87 bool allow_trust_imports_;
88 88
89 DISALLOW_COPY_AND_ASSIGN(CertificateImporter); 89 DISALLOW_COPY_AND_ASSIGN(CertificateImporter);
90 }; 90 };
91 91
92 } // namespace onc 92 } // namespace onc
93 } // namespace chromeos 93 } // namespace chromeos
94 94
95 #endif // CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_H_ 95 #endif // CHROMEOS_NETWORK_ONC_ONC_CERTIFICATE_IMPORTER_H_
OLDNEW
« 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