summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-28 03:56:46 +0000
committerjamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-28 03:56:46 +0000
commit8b02f7de252dba372f6f393a2f0130f893af3cb9 (patch)
treef2b65e80a965bf5df541f5275a3aa07ac471740d /chrome
parentd5c0c52b79e4e0402f7fb751e0af561dc8368eb0 (diff)
downloadchromium_src-8b02f7de252dba372f6f393a2f0130f893af3cb9.zip
chromium_src-8b02f7de252dba372f6f393a2f0130f893af3cb9.tar.gz
chromium_src-8b02f7de252dba372f6f393a2f0130f893af3cb9.tar.bz2
CrOS - Send EAP.KeyID for 802.1X Wi-Fi connections
BUG=chromium-os:15844 TEST=Connect to an EAP-TLS Wi-Fi network that requires a client certification. Review URL: http://codereview.chromium.org/7071047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87155 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/chromeos/cros/network_library.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc
index a3130af..4e0ba73 100644
--- a/chrome/browser/chromeos/cros/network_library.cc
+++ b/chrome/browser/chromeos/cros/network_library.cc
@@ -2198,6 +2198,9 @@ void WifiNetwork::SetEAPClientCertPkcs11Id(const std::string& pkcs11_id) {
VLOG(1) << "SetEAPClientCertPkcs11Id " << pkcs11_id;
SetOrClearStringProperty(kEapCertIDProperty, pkcs11_id,
&eap_client_cert_pkcs11_id_);
+ // flimflam requires both CertID and KeyID for TLS connections, despite
+ // the fact that by convention they are the same ID.
+ SetOrClearStringProperty(kEapKeyIDProperty, pkcs11_id, NULL);
}
void WifiNetwork::SetEAPUseSystemCAs(bool use_system_cas) {