diff options
| author | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 22:21:58 +0000 |
|---|---|---|
| committer | stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-11 22:21:58 +0000 |
| commit | 51484fe8e0250a2189976fc00d391097a62ea19c (patch) | |
| tree | e657abae25ec42849cc6a4e49590300fc47b5e03 /chrome/browser/chromeos/cros/network_library.cc | |
| parent | e0959571dacd64d1a6b8cd7f901d926594037d15 (diff) | |
| download | chromium_src-51484fe8e0250a2189976fc00d391097a62ea19c.zip chromium_src-51484fe8e0250a2189976fc00d391097a62ea19c.tar.gz chromium_src-51484fe8e0250a2189976fc00d391097a62ea19c.tar.bz2 | |
Configure networks requiring a certificate.
Original CL: https://chromiumcodereview.appspot.com/16512003/
The current flow does not guarantee that a configured network will have
its tpm / pkcs11 credentials configured. We need to set these
properties in order to reliably connect to networks requiring
certificates. The patch also includes some minor changes to improve
error reporting and configuration triggering for failure cases.
This patch does not introduce NetworkHandler::InitializeForTest and
instead allows NetworkConnectionHandler to Initialize correctly when
LoginState is not initialized.
BUG=247104
TBR=gspencer@chromium.org,pneubeck@chromium.org
For /wifi_data_provider_chromeos_unittest.cc:
TBR=joth@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16045010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205653 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 57405b3..5076cdc 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -518,7 +518,7 @@ std::string Network::GetErrorString() const { IDS_CHROMEOS_NETWORK_ERROR_IPSEC_PSK_AUTH_FAILED); case ERROR_IPSEC_CERT_AUTH_FAILED: return l10n_util::GetStringUTF8( - IDS_CHROMEOS_NETWORK_ERROR_IPSEC_CERT_AUTH_FAILED); + IDS_CHROMEOS_NETWORK_ERROR_CERT_AUTH_FAILED); case ERROR_PPP_AUTH_FAILED: case ERROR_EAP_AUTHENTICATION_FAILED: case ERROR_EAP_LOCAL_TLS_FAILED: |