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

Side by Side Diff: chromeos/network/onc/onc_certificate_importer_impl_unittest.cc

Issue 148183013: Use per-user nssdb in onc certificate importer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix browser_tests compile Created 6 years, 10 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/network/onc/onc_certificate_importer_impl.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "chromeos/network/onc/onc_certificate_importer_impl.h" 5 #include "chromeos/network/onc/onc_certificate_importer_impl.h"
6 6
7 #include <cert.h> 7 #include <cert.h>
8 #include <certdb.h> 8 #include <certdb.h>
9 #include <keyhi.h> 9 #include <keyhi.h>
10 #include <pk11pub.h> 10 #include <pk11pub.h>
11 #include <string> 11 #include <string>
12 12
13 #include "base/bind.h"
13 #include "base/logging.h" 14 #include "base/logging.h"
14 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
15 #include "base/values.h" 16 #include "base/values.h"
16 #include "chromeos/network/onc/onc_test_utils.h" 17 #include "chromeos/network/onc/onc_test_utils.h"
17 #include "components/onc/onc_constants.h" 18 #include "components/onc/onc_constants.h"
18 #include "crypto/nss_util.h" 19 #include "crypto/nss_util.h"
20 #include "crypto/nss_util_internal.h"
19 #include "net/base/crypto_module.h" 21 #include "net/base/crypto_module.h"
20 #include "net/cert/cert_type.h" 22 #include "net/cert/cert_type.h"
21 #include "net/cert/nss_cert_database.h" 23 #include "net/cert/nss_cert_database_chromeos.h"
22 #include "net/cert/x509_certificate.h" 24 #include "net/cert/x509_certificate.h"
23 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
24 26
25 namespace chromeos { 27 namespace chromeos {
26 namespace onc { 28 namespace onc {
27 29
30 namespace {
31
28 #if defined(USE_NSS) 32 #if defined(USE_NSS)
29 // In NSS 3.13, CERTDB_VALID_PEER was renamed CERTDB_TERMINAL_RECORD. So we use 33 // In NSS 3.13, CERTDB_VALID_PEER was renamed CERTDB_TERMINAL_RECORD. So we use
30 // the new name of the macro. 34 // the new name of the macro.
31 #if !defined(CERTDB_TERMINAL_RECORD) 35 #if !defined(CERTDB_TERMINAL_RECORD)
32 #define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER 36 #define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER
33 #endif 37 #endif
34 38
35 net::CertType GetCertType(net::X509Certificate::OSCertHandle cert) { 39 net::CertType GetCertType(net::X509Certificate::OSCertHandle cert) {
36 CERTCertTrust trust = {0}; 40 CERTCertTrust trust = {0};
37 CERT_GetCertTrust(cert, &trust); 41 CERT_GetCertTrust(cert, &trust);
(...skipping 10 matching lines...) Expand all
48 return net::SERVER_CERT; 52 return net::SERVER_CERT;
49 return net::OTHER_CERT; 53 return net::OTHER_CERT;
50 } 54 }
51 #else 55 #else
52 net::CertType GetCertType(net::X509Certificate::OSCertHandle cert) { 56 net::CertType GetCertType(net::X509Certificate::OSCertHandle cert) {
53 NOTIMPLEMENTED(); 57 NOTIMPLEMENTED();
54 return net::OTHER_CERT; 58 return net::OTHER_CERT;
55 } 59 }
56 #endif // USE_NSS 60 #endif // USE_NSS
57 61
62 } // namespace
63
58 class ONCCertificateImporterImplTest : public testing::Test { 64 class ONCCertificateImporterImplTest : public testing::Test {
59 public: 65 public:
66 ONCCertificateImporterImplTest() : user_("username_hash"),
67 private_user_("private_user_hash") {}
68
60 virtual void SetUp() { 69 virtual void SetUp() {
61 ASSERT_TRUE(test_nssdb_.is_open()); 70 ASSERT_TRUE(user_.constructed_successfully());
71 ASSERT_TRUE(private_user_.constructed_successfully());
62 72
63 slot_ = net::NSSCertDatabase::GetInstance()->GetPublicModule(); 73 // By default test user will have the same public and private slot.
64 74 // Unfortunatelly, ONC importer should care about which slot certificates
65 // Don't run the test if the setup failed. 75 // get imported to. To work around this, we create another NSS user whose
66 ASSERT_TRUE(slot_->os_module_handle()); 76 // public slot will act as the private slot.
77 // TODO(tbarzic): See if there's a better way to achieve this.
78 test_nssdb_.reset(new net::NSSCertDatabaseChromeOS(
79 crypto::GetPublicSlotForChromeOSUser(user_.username_hash()),
80 crypto::GetPublicSlotForChromeOSUser(private_user_.username_hash())));
67 81
68 // Test db should be empty at start of test. 82 // Test db should be empty at start of test.
69 EXPECT_EQ(0ul, ListCertsInSlot().size()); 83 EXPECT_TRUE(ListCertsInPublicSlot().empty());
70 } 84 EXPECT_TRUE(ListCertsInPrivateSlot().empty());
71
72 virtual void TearDown() {
73 EXPECT_TRUE(CleanupSlotContents());
74 EXPECT_EQ(0ul, ListCertsInSlot().size());
75 } 85 }
76 86
77 virtual ~ONCCertificateImporterImplTest() {} 87 virtual ~ONCCertificateImporterImplTest() {}
78 88
79 protected: 89 protected:
80 void AddCertificatesFromFile(std::string filename, bool expected_success) { 90 void AddCertificatesFromFile(std::string filename, bool expected_success) {
81 scoped_ptr<base::DictionaryValue> onc = 91 scoped_ptr<base::DictionaryValue> onc =
82 test_utils::ReadTestDictionary(filename); 92 test_utils::ReadTestDictionary(filename);
83 scoped_ptr<base::Value> certificates_value; 93 scoped_ptr<base::Value> certificates_value;
84 base::ListValue* certificates = NULL; 94 base::ListValue* certificates = NULL;
85 onc->RemoveWithoutPathExpansion(::onc::toplevel_config::kCertificates, 95 onc->RemoveWithoutPathExpansion(::onc::toplevel_config::kCertificates,
86 &certificates_value); 96 &certificates_value);
87 certificates_value.release()->GetAsList(&certificates); 97 certificates_value.release()->GetAsList(&certificates);
88 onc_certificates_.reset(certificates); 98 onc_certificates_.reset(certificates);
89 99
90 web_trust_certificates_.clear(); 100 web_trust_certificates_.clear();
91 imported_server_and_ca_certs_.clear(); 101 imported_server_and_ca_certs_.clear();
92 CertificateImporterImpl importer; 102 CertificateImporterImpl importer(test_nssdb_.get());
93 EXPECT_EQ( 103 EXPECT_EQ(
94 expected_success, 104 expected_success,
95 importer.ParseAndStoreCertificates(true, // allow web trust 105 importer.ParseAndStoreCertificates(true, // allow web trust
96 *certificates, 106 *certificates,
97 &web_trust_certificates_, 107 &web_trust_certificates_,
98 &imported_server_and_ca_certs_)); 108 &imported_server_and_ca_certs_));
99 109
100 result_list_.clear(); 110 public_list_ = ListCertsInPublicSlot();
101 result_list_ = ListCertsInSlot(); 111 private_list_ = ListCertsInPrivateSlot();
102 } 112 }
103 113
104 void AddCertificateFromFile(std::string filename, 114 void AddCertificateFromFile(std::string filename,
105 net::CertType expected_type, 115 net::CertType expected_type,
106 std::string* guid) { 116 std::string* guid) {
107 std::string guid_temporary; 117 std::string guid_temporary;
108 if (!guid) 118 if (!guid)
109 guid = &guid_temporary; 119 guid = &guid_temporary;
110 120
111 AddCertificatesFromFile(filename, true); 121 AddCertificatesFromFile(filename, true);
112 ASSERT_EQ(1ul, result_list_.size()); 122 ASSERT_EQ(1ul, public_list_.size() + private_list_.size());
113 EXPECT_EQ(expected_type, GetCertType(result_list_[0]->os_cert_handle())); 123 if (!public_list_.empty())
124 EXPECT_EQ(expected_type, GetCertType(public_list_[0]->os_cert_handle()));
125 if (!private_list_.empty())
126 EXPECT_EQ(expected_type, GetCertType(private_list_[0]->os_cert_handle()));
114 127
115 base::DictionaryValue* certificate = NULL; 128 base::DictionaryValue* certificate = NULL;
116 onc_certificates_->GetDictionary(0, &certificate); 129 onc_certificates_->GetDictionary(0, &certificate);
117 certificate->GetStringWithoutPathExpansion(::onc::certificate::kGUID, guid); 130 certificate->GetStringWithoutPathExpansion(::onc::certificate::kGUID, guid);
118 131
119 if (expected_type == net::SERVER_CERT || expected_type == net::CA_CERT) { 132 if (expected_type == net::SERVER_CERT || expected_type == net::CA_CERT) {
120 EXPECT_EQ(1u, imported_server_and_ca_certs_.size()); 133 EXPECT_EQ(1u, imported_server_and_ca_certs_.size());
121 EXPECT_TRUE(imported_server_and_ca_certs_[*guid]->Equals( 134 EXPECT_TRUE(imported_server_and_ca_certs_[*guid]->Equals(
122 result_list_[0])); 135 public_list_[0]));
123 } else { // net::USER_CERT 136 } else { // net::USER_CERT
124 EXPECT_TRUE(imported_server_and_ca_certs_.empty()); 137 EXPECT_TRUE(imported_server_and_ca_certs_.empty());
125 CertificateImporterImpl::ListCertsWithNickname(*guid, &result_list_);
126 } 138 }
127 } 139 }
128 140
141 scoped_ptr<net::NSSCertDatabaseChromeOS> test_nssdb_;
129 scoped_ptr<base::ListValue> onc_certificates_; 142 scoped_ptr<base::ListValue> onc_certificates_;
130 scoped_refptr<net::CryptoModule> slot_; 143 // List of certs in the nssdb's public slot.
131 net::CertificateList result_list_; 144 net::CertificateList public_list_;
145 // List of certs in the nssdb's "private" slot.
146 net::CertificateList private_list_;
132 net::CertificateList web_trust_certificates_; 147 net::CertificateList web_trust_certificates_;
133 CertificateImporterImpl::CertsByGUID imported_server_and_ca_certs_; 148 CertificateImporterImpl::CertsByGUID imported_server_and_ca_certs_;
134 149
135 private: 150 private:
136 net::CertificateList ListCertsInSlot() { 151 net::CertificateList ListCertsInPublicSlot() {
152 return ListCertsInSlot(test_nssdb_->GetPublicSlot().get());
153 }
154
155 net::CertificateList ListCertsInPrivateSlot() {
156 return ListCertsInSlot(test_nssdb_->GetPrivateSlot().get());
157 }
158
159 net::CertificateList ListCertsInSlot(PK11SlotInfo* slot) {
137 net::CertificateList result; 160 net::CertificateList result;
138 CERTCertList* cert_list = PK11_ListCertsInSlot(slot_->os_module_handle()); 161 CERTCertList* cert_list = PK11_ListCertsInSlot(slot);
139 for (CERTCertListNode* node = CERT_LIST_HEAD(cert_list); 162 for (CERTCertListNode* node = CERT_LIST_HEAD(cert_list);
140 !CERT_LIST_END(node, cert_list); 163 !CERT_LIST_END(node, cert_list);
141 node = CERT_LIST_NEXT(node)) { 164 node = CERT_LIST_NEXT(node)) {
142 result.push_back(net::X509Certificate::CreateFromHandle( 165 result.push_back(net::X509Certificate::CreateFromHandle(
143 node->cert, net::X509Certificate::OSCertHandles())); 166 node->cert, net::X509Certificate::OSCertHandles()));
144 } 167 }
145 CERT_DestroyCertList(cert_list); 168 CERT_DestroyCertList(cert_list);
146 169
147 // Sort the result so that test comparisons can be deterministic. 170 // Sort the result so that test comparisons can be deterministic.
148 std::sort(result.begin(), result.end(), net::X509Certificate::LessThan()); 171 std::sort(result.begin(), result.end(), net::X509Certificate::LessThan());
149 return result; 172 return result;
150 } 173 }
151 174
152 bool CleanupSlotContents() { 175 crypto::ScopedTestNSSChromeOSUser user_;
153 bool ok = true; 176 crypto::ScopedTestNSSChromeOSUser private_user_;
154 net::CertificateList certs = ListCertsInSlot();
155 for (size_t i = 0; i < certs.size(); ++i) {
156 if (!net::NSSCertDatabase::GetInstance()->DeleteCertAndKey(certs[i]
157 .get()))
158 ok = false;
159 }
160 return ok;
161 }
162
163 crypto::ScopedTestNSSDB test_nssdb_;
164 }; 177 };
165 178
166 TEST_F(ONCCertificateImporterImplTest, MultipleCertificates) { 179 TEST_F(ONCCertificateImporterImplTest, MultipleCertificates) {
167 AddCertificatesFromFile("managed_toplevel2.onc", true); 180 AddCertificatesFromFile("managed_toplevel2.onc", true);
168 EXPECT_EQ(onc_certificates_->GetSize(), result_list_.size()); 181 EXPECT_EQ(onc_certificates_->GetSize(), public_list_.size());
182 EXPECT_TRUE(private_list_.empty());
169 EXPECT_EQ(2ul, imported_server_and_ca_certs_.size()); 183 EXPECT_EQ(2ul, imported_server_and_ca_certs_.size());
170 } 184 }
171 185
172 TEST_F(ONCCertificateImporterImplTest, MultipleCertificatesWithFailures) { 186 TEST_F(ONCCertificateImporterImplTest, MultipleCertificatesWithFailures) {
173 AddCertificatesFromFile("toplevel_partially_invalid.onc", false); 187 AddCertificatesFromFile("toplevel_partially_invalid.onc", false);
174 EXPECT_EQ(3ul, onc_certificates_->GetSize()); 188 EXPECT_EQ(3ul, onc_certificates_->GetSize());
175 EXPECT_EQ(1ul, result_list_.size()); 189 EXPECT_EQ(1ul, private_list_.size());
190 EXPECT_TRUE(public_list_.empty());
176 EXPECT_TRUE(imported_server_and_ca_certs_.empty()); 191 EXPECT_TRUE(imported_server_and_ca_certs_.empty());
177 } 192 }
178 193
179 TEST_F(ONCCertificateImporterImplTest, AddClientCertificate) { 194 TEST_F(ONCCertificateImporterImplTest, AddClientCertificate) {
180 std::string guid; 195 std::string guid;
181 AddCertificateFromFile("certificate-client.onc", net::USER_CERT, &guid); 196 AddCertificateFromFile("certificate-client.onc", net::USER_CERT, &guid);
182 EXPECT_TRUE(web_trust_certificates_.empty()); 197 EXPECT_TRUE(web_trust_certificates_.empty());
198 EXPECT_EQ(1ul, private_list_.size());
199 EXPECT_TRUE(public_list_.empty());
183 200
184 SECKEYPrivateKeyList* privkey_list = 201 SECKEYPrivateKeyList* privkey_list =
185 PK11_ListPrivKeysInSlot(slot_->os_module_handle(), NULL, NULL); 202 PK11_ListPrivKeysInSlot(test_nssdb_->GetPrivateSlot().get(), NULL, NULL);
186 EXPECT_TRUE(privkey_list); 203 EXPECT_TRUE(privkey_list);
187 if (privkey_list) { 204 if (privkey_list) {
188 SECKEYPrivateKeyListNode* node = PRIVKEY_LIST_HEAD(privkey_list); 205 SECKEYPrivateKeyListNode* node = PRIVKEY_LIST_HEAD(privkey_list);
189 int count = 0; 206 int count = 0;
190 while (!PRIVKEY_LIST_END(node, privkey_list)) { 207 while (!PRIVKEY_LIST_END(node, privkey_list)) {
191 char* name = PK11_GetPrivateKeyNickname(node->key); 208 char* name = PK11_GetPrivateKeyNickname(node->key);
192 EXPECT_STREQ(guid.c_str(), name); 209 EXPECT_STREQ(guid.c_str(), name);
193 PORT_Free(name); 210 PORT_Free(name);
194 count++; 211 count++;
195 node = PRIVKEY_LIST_NEXT(node); 212 node = PRIVKEY_LIST_NEXT(node);
196 } 213 }
197 EXPECT_EQ(1, count); 214 EXPECT_EQ(1, count);
198 SECKEY_DestroyPrivateKeyList(privkey_list); 215 SECKEY_DestroyPrivateKeyList(privkey_list);
199 } 216 }
200 217
201 SECKEYPublicKeyList* pubkey_list = 218 SECKEYPublicKeyList* pubkey_list =
202 PK11_ListPublicKeysInSlot(slot_->os_module_handle(), NULL); 219 PK11_ListPublicKeysInSlot(test_nssdb_->GetPrivateSlot().get(), NULL);
203 EXPECT_TRUE(pubkey_list); 220 EXPECT_TRUE(pubkey_list);
204 if (pubkey_list) { 221 if (pubkey_list) {
205 SECKEYPublicKeyListNode* node = PUBKEY_LIST_HEAD(pubkey_list); 222 SECKEYPublicKeyListNode* node = PUBKEY_LIST_HEAD(pubkey_list);
206 int count = 0; 223 int count = 0;
207 while (!PUBKEY_LIST_END(node, pubkey_list)) { 224 while (!PUBKEY_LIST_END(node, pubkey_list)) {
208 count++; 225 count++;
209 node = PUBKEY_LIST_NEXT(node); 226 node = PUBKEY_LIST_NEXT(node);
210 } 227 }
211 EXPECT_EQ(1, count); 228 EXPECT_EQ(1, count);
212 SECKEY_DestroyPublicKeyList(pubkey_list); 229 SECKEY_DestroyPublicKeyList(pubkey_list);
213 } 230 }
214 } 231 }
215 232
216 TEST_F(ONCCertificateImporterImplTest, AddServerCertificateWithWebTrust) { 233 TEST_F(ONCCertificateImporterImplTest, AddServerCertificateWithWebTrust) {
217 AddCertificateFromFile("certificate-server.onc", net::SERVER_CERT, NULL); 234 AddCertificateFromFile("certificate-server.onc", net::SERVER_CERT, NULL);
218 235
219 SECKEYPrivateKeyList* privkey_list = 236 SECKEYPrivateKeyList* privkey_list =
220 PK11_ListPrivKeysInSlot(slot_->os_module_handle(), NULL, NULL); 237 PK11_ListPrivKeysInSlot(test_nssdb_->GetPrivateSlot().get(), NULL, NULL);
221 EXPECT_FALSE(privkey_list); 238 EXPECT_FALSE(privkey_list);
222 239
223 SECKEYPublicKeyList* pubkey_list = 240 SECKEYPublicKeyList* pubkey_list =
224 PK11_ListPublicKeysInSlot(slot_->os_module_handle(), NULL); 241 PK11_ListPublicKeysInSlot(test_nssdb_->GetPrivateSlot().get(), NULL);
225 EXPECT_FALSE(pubkey_list); 242 EXPECT_FALSE(pubkey_list);
226 243
227 ASSERT_EQ(1u, web_trust_certificates_.size()); 244 ASSERT_EQ(1u, web_trust_certificates_.size());
228 ASSERT_EQ(1u, result_list_.size()); 245 ASSERT_EQ(1u, public_list_.size());
229 EXPECT_TRUE(CERT_CompareCerts(result_list_[0]->os_cert_handle(), 246 EXPECT_TRUE(private_list_.empty());
247 EXPECT_TRUE(CERT_CompareCerts(public_list_[0]->os_cert_handle(),
230 web_trust_certificates_[0]->os_cert_handle())); 248 web_trust_certificates_[0]->os_cert_handle()));
231 } 249 }
232 250
233 TEST_F(ONCCertificateImporterImplTest, AddWebAuthorityCertificateWithWebTrust) { 251 TEST_F(ONCCertificateImporterImplTest, AddWebAuthorityCertificateWithWebTrust) {
234 AddCertificateFromFile("certificate-web-authority.onc", net::CA_CERT, NULL); 252 AddCertificateFromFile("certificate-web-authority.onc", net::CA_CERT, NULL);
235 253
236 SECKEYPrivateKeyList* privkey_list = 254 SECKEYPrivateKeyList* privkey_list =
237 PK11_ListPrivKeysInSlot(slot_->os_module_handle(), NULL, NULL); 255 PK11_ListPrivKeysInSlot(test_nssdb_->GetPrivateSlot().get(), NULL, NULL);
238 EXPECT_FALSE(privkey_list); 256 EXPECT_FALSE(privkey_list);
239 257
240 SECKEYPublicKeyList* pubkey_list = 258 SECKEYPublicKeyList* pubkey_list =
241 PK11_ListPublicKeysInSlot(slot_->os_module_handle(), NULL); 259 PK11_ListPublicKeysInSlot(test_nssdb_->GetPrivateSlot().get(), NULL);
242 EXPECT_FALSE(pubkey_list); 260 EXPECT_FALSE(pubkey_list);
243 261
244 ASSERT_EQ(1u, web_trust_certificates_.size()); 262 ASSERT_EQ(1u, web_trust_certificates_.size());
245 ASSERT_EQ(1u, result_list_.size()); 263 ASSERT_EQ(1u, public_list_.size());
246 EXPECT_TRUE(CERT_CompareCerts(result_list_[0]->os_cert_handle(), 264 EXPECT_TRUE(private_list_.empty());
265 EXPECT_TRUE(CERT_CompareCerts(public_list_[0]->os_cert_handle(),
247 web_trust_certificates_[0]->os_cert_handle())); 266 web_trust_certificates_[0]->os_cert_handle()));
248 } 267 }
249 268
250 TEST_F(ONCCertificateImporterImplTest, AddAuthorityCertificateWithoutWebTrust) { 269 TEST_F(ONCCertificateImporterImplTest, AddAuthorityCertificateWithoutWebTrust) {
251 AddCertificateFromFile("certificate-authority.onc", net::CA_CERT, NULL); 270 AddCertificateFromFile("certificate-authority.onc", net::CA_CERT, NULL);
252 EXPECT_TRUE(web_trust_certificates_.empty()); 271 EXPECT_TRUE(web_trust_certificates_.empty());
253 272
254 SECKEYPrivateKeyList* privkey_list = 273 SECKEYPrivateKeyList* privkey_list =
255 PK11_ListPrivKeysInSlot(slot_->os_module_handle(), NULL, NULL); 274 PK11_ListPrivKeysInSlot(test_nssdb_->GetPrivateSlot().get(), NULL, NULL);
256 EXPECT_FALSE(privkey_list); 275 EXPECT_FALSE(privkey_list);
257 276
258 SECKEYPublicKeyList* pubkey_list = 277 SECKEYPublicKeyList* pubkey_list =
259 PK11_ListPublicKeysInSlot(slot_->os_module_handle(), NULL); 278 PK11_ListPublicKeysInSlot(test_nssdb_->GetPrivateSlot().get(), NULL);
260 EXPECT_FALSE(pubkey_list); 279 EXPECT_FALSE(pubkey_list);
261 } 280 }
262 281
263 struct CertParam { 282 struct CertParam {
264 CertParam(net::CertType certificate_type, 283 CertParam(net::CertType certificate_type,
265 const char* original_filename, 284 const char* original_filename,
266 const char* update_filename) 285 const char* update_filename)
267 : cert_type(certificate_type), 286 : cert_type(certificate_type),
268 original_file(original_filename), 287 original_file(original_filename),
269 update_file(update_filename) {} 288 update_file(update_filename) {}
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 "certificate-client-update.onc"), 331 "certificate-client-update.onc"),
313 CertParam(net::SERVER_CERT, 332 CertParam(net::SERVER_CERT,
314 "certificate-server.onc", 333 "certificate-server.onc",
315 "certificate-server-update.onc"), 334 "certificate-server-update.onc"),
316 CertParam(net::CA_CERT, 335 CertParam(net::CA_CERT,
317 "certificate-web-authority.onc", 336 "certificate-web-authority.onc",
318 "certificate-web-authority-update.onc"))); 337 "certificate-web-authority-update.onc")));
319 338
320 } // namespace onc 339 } // namespace onc
321 } // namespace chromeos 340 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/onc/onc_certificate_importer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698