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

Side by Side Diff: chromeos/network/client_cert_resolver.cc

Issue 2858113003: Enable device-wide EAP-TLS networks (Closed)
Patch Set: Addressed comments and fixed weak_ptr access from wrong thread. Created 3 years, 7 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
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/client_cert_resolver.h" 5 #include "chromeos/network/client_cert_resolver.h"
6 6
7 #include <cert.h> 7 #include <cert.h>
8 #include <certt.h> // for (SECCertUsageEnum) certUsageAnyCA 8 #include <certt.h> // for (SECCertUsageEnum) certUsageAnyCA
9 #include <pk11pub.h> 9 #include <pk11pub.h>
10 10
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 const std::string& dbus_error_message) { 275 const std::string& dbus_error_message) {
276 network_handler::ShillErrorCallbackFunction( 276 network_handler::ShillErrorCallbackFunction(
277 "ClientCertResolver.SetProperties failed", 277 "ClientCertResolver.SetProperties failed",
278 service_path, 278 service_path,
279 network_handler::ErrorCallback(), 279 network_handler::ErrorCallback(),
280 dbus_error_name, 280 dbus_error_name,
281 dbus_error_message); 281 dbus_error_message);
282 } 282 }
283 283
284 bool ClientCertificatesLoaded() { 284 bool ClientCertificatesLoaded() {
285 if (!CertLoader::Get()->certificates_loaded()) { 285 if (!CertLoader::Get()->initial_load_finished()) {
286 VLOG(1) << "Certificates not loaded yet."; 286 VLOG(1) << "Certificates not loaded yet.";
287 return false; 287 return false;
288 } 288 }
289 return true; 289 return true;
290 } 290 }
291 291
292 } // namespace 292 } // namespace
293 293
294 ClientCertResolver::ClientCertResolver() 294 ClientCertResolver::ClientCertResolver()
295 : resolve_task_running_(false), 295 : resolve_task_running_(false),
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 observer.ResolveRequestCompleted(changed); 585 observer.ResolveRequestCompleted(changed);
586 } 586 }
587 587
588 base::Time ClientCertResolver::Now() const { 588 base::Time ClientCertResolver::Now() const {
589 if (testing_clock_) 589 if (testing_clock_)
590 return testing_clock_->Now(); 590 return testing_clock_->Now();
591 return base::Time::Now(); 591 return base::Time::Now();
592 } 592 }
593 593
594 } // namespace chromeos 594 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/auto_connect_handler_unittest.cc ('k') | chromeos/network/client_cert_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698