| OLD | NEW |
| 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 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 509 *networks_to_resolve) { | 509 *networks_to_resolve) { |
| 510 queued_networks_to_resolve_.insert(network_and_pattern.service_path); | 510 queued_networks_to_resolve_.insert(network_and_pattern.service_path); |
| 511 } | 511 } |
| 512 return; | 512 return; |
| 513 } | 513 } |
| 514 | 514 |
| 515 VLOG(2) << "Start task for resolving client cert patterns."; | 515 VLOG(2) << "Start task for resolving client cert patterns."; |
| 516 resolve_task_running_ = true; | 516 resolve_task_running_ = true; |
| 517 base::PostTaskWithTraitsAndReplyWithResult( | 517 base::PostTaskWithTraitsAndReplyWithResult( |
| 518 FROM_HERE, | 518 FROM_HERE, |
| 519 base::TaskTraits() | 519 {base::MayBlock(), base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN}, |
| 520 .WithShutdownBehavior( | |
| 521 base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN) | |
| 522 .MayBlock(), | |
| 523 base::Bind(&FindCertificateMatches, CertLoader::Get()->all_certs(), | 520 base::Bind(&FindCertificateMatches, CertLoader::Get()->all_certs(), |
| 524 CertLoader::Get()->system_certs(), | 521 CertLoader::Get()->system_certs(), |
| 525 base::Owned(networks_to_resolve.release()), Now()), | 522 base::Owned(networks_to_resolve.release()), Now()), |
| 526 base::Bind(&ClientCertResolver::ConfigureCertificates, | 523 base::Bind(&ClientCertResolver::ConfigureCertificates, |
| 527 weak_ptr_factory_.GetWeakPtr())); | 524 weak_ptr_factory_.GetWeakPtr())); |
| 528 } | 525 } |
| 529 | 526 |
| 530 void ClientCertResolver::ResolvePendingNetworks() { | 527 void ClientCertResolver::ResolvePendingNetworks() { |
| 531 NetworkStateHandler::NetworkStateList networks; | 528 NetworkStateHandler::NetworkStateList networks; |
| 532 network_state_handler_->GetNetworkListByType(NetworkTypePattern::Default(), | 529 network_state_handler_->GetNetworkListByType(NetworkTypePattern::Default(), |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 588 observer.ResolveRequestCompleted(changed); | 585 observer.ResolveRequestCompleted(changed); |
| 589 } | 586 } |
| 590 | 587 |
| 591 base::Time ClientCertResolver::Now() const { | 588 base::Time ClientCertResolver::Now() const { |
| 592 if (testing_clock_) | 589 if (testing_clock_) |
| 593 return testing_clock_->Now(); | 590 return testing_clock_->Now(); |
| 594 return base::Time::Now(); | 591 return base::Time::Now(); |
| 595 } | 592 } |
| 596 | 593 |
| 597 } // namespace chromeos | 594 } // namespace chromeos |
| OLD | NEW |