diff options
| author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 23:47:16 +0000 |
|---|---|---|
| committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-24 23:47:16 +0000 |
| commit | 602859a54d01fe9ad6c5270faf73e0f1dad67164 (patch) | |
| tree | 3db8f3709a803218871b6d1e95bfdc9050bdaa2b | |
| parent | b210541d361f4951768f1fe654d32c31e8e171b4 (diff) | |
| download | chromium_src-602859a54d01fe9ad6c5270faf73e0f1dad67164.zip chromium_src-602859a54d01fe9ad6c5270faf73e0f1dad67164.tar.gz chromium_src-602859a54d01fe9ad6c5270faf73e0f1dad67164.tar.bz2 | |
Merge 153345 - This fixes a problem in the mapping of WPA-PSK in Chrome
where it used to map to "wpa", which shill interprets as
"WPA1 only", when it should map to "psk", which maps to
either WPA1 or WPA2 with PSK.
BUG=chromium-os:28840,chromium:139276,chromium:144703
TEST=ran on device, imported ONC with WPA-PSK network,
connected successfully to an RSN configured access point.
Review URL: https://chromiumcodereview.appspot.com/10879081
TBR=gspencer@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10874073
git-svn-id: svn://svn.chromium.org/chrome/branches/1180/src@153348 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/cros/onc_network_parser.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/cros/onc_network_parser.cc b/chrome/browser/chromeos/cros/onc_network_parser.cc index 2b5a349..d172618 100644 --- a/chrome/browser/chromeos/cros/onc_network_parser.cc +++ b/chrome/browser/chromeos/cros/onc_network_parser.cc @@ -1654,7 +1654,7 @@ ConnectionSecurity OncWifiNetworkParser::ParseSecurity( static EnumMapper<ConnectionSecurity>::Pair table[] = { { "None", SECURITY_NONE }, { "WEP-PSK", SECURITY_WEP }, - { "WPA-PSK", SECURITY_WPA }, + { "WPA-PSK", SECURITY_PSK }, { "WPA-EAP", SECURITY_8021X }, }; CR_DEFINE_STATIC_LOCAL(EnumMapper<ConnectionSecurity>, parser, |