diff options
| author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-12 15:22:49 +0000 |
|---|---|---|
| committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-12 15:22:49 +0000 |
| commit | b1f3f527f1c81d52be8cb8e8ca5499de9ca88275 (patch) | |
| tree | f1764b07fe5c899cb074123221c05d8f86938ab0 /chrome/browser/chromeos/cros/network_library.cc | |
| parent | 44aa2bc3d2dfb8c555af66a371d18d8474ac2028 (diff) | |
| download | chromium_src-b1f3f527f1c81d52be8cb8e8ca5499de9ca88275.zip chromium_src-b1f3f527f1c81d52be8cb8e8ca5499de9ca88275.tar.gz chromium_src-b1f3f527f1c81d52be8cb8e8ca5499de9ca88275.tar.bz2 | |
Refactor the client certificate code in chromeos/network/.
This prepares for the next commit, which adds automatic resolution of client certificates which doesn't require a manual trigger by the user anymore.
The only functional is that flimflam::kOpenVPNClientCertSlotProperty is not set anymore, because it was never supported by Shill and leads to errors with Service::SetProperties.
BUG=234983, 126870
R=stevenjb@chromium.org
Review URL: https://codereview.chromium.org/22588002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216997 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/cros/network_library.cc')
| -rw-r--r-- | chrome/browser/chromeos/cros/network_library.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 9943d9e..0a709fd 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -18,7 +18,7 @@ #include "chrome/browser/chromeos/enrollment_dialog_view.h" #include "chrome/common/net/x509_certificate_model.h" #include "chromeos/network/certificate_pattern.h" -#include "chromeos/network/certificate_pattern_matcher.h" +#include "chromeos/network/client_cert_util.h" #include "chromeos/network/cros_network_functions.h" #include "chromeos/network/network_state_handler.h" #include "chromeos/network/onc/onc_utils.h" @@ -768,7 +768,7 @@ void VirtualNetwork::MatchCertificatePattern(bool allow_enroll, } scoped_refptr<net::X509Certificate> matching_cert = - certificate_pattern::GetCertificateMatch(client_cert_pattern()); + client_cert::GetCertificateMatch(client_cert_pattern()); if (matching_cert.get()) { std::string client_cert_id = x509_certificate_model::GetPkcs11Id(matching_cert->os_cert_handle()); @@ -1285,7 +1285,7 @@ void WifiNetwork::MatchCertificatePattern(bool allow_enroll, } scoped_refptr<net::X509Certificate> matching_cert = - certificate_pattern::GetCertificateMatch(client_cert_pattern()); + client_cert::GetCertificateMatch(client_cert_pattern()); if (matching_cert.get()) { SetEAPClientCertPkcs11Id( x509_certificate_model::GetPkcs11Id(matching_cert->os_cert_handle())); |