diff options
author | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 20:58:09 +0000 |
---|---|---|
committer | pneubeck@chromium.org <pneubeck@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 20:58:09 +0000 |
commit | d027020080801b97d742aab193f87f8352216251 (patch) | |
tree | 5f8d5bc18ae999c7c170d94a50e52ff9747524f5 /components/wifi/wifi_service_win.cc | |
parent | dab2832fa8ba2e9011545ac7d97bbd32d7204563 (diff) | |
download | chromium_src-d027020080801b97d742aab193f87f8352216251.zip chromium_src-d027020080801b97d742aab193f87f8352216251.tar.gz chromium_src-d027020080801b97d742aab193f87f8352216251.tar.bz2 |
ONC: Cleanup client certificate related fields.
Before, each network type had its own constants for ClientCert{Type,Pattern,Ref} which lead to duplicate implementations.
These constants are now unified into the namespace onc::client_cert together with the other client certificate related constants.
This leads to a clearer separation from the Certificate ONC object (has namespace onc::certificate)
and simplifies some code (see network_ui_data.cc and onc_validator.cc).
BUG=391292
(For trivial constant renaming:)
TBR=mef@chromium.org,vitalybuka@chromium.org
Review URL: https://codereview.chromium.org/368233004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281820 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/wifi/wifi_service_win.cc')
-rw-r--r-- | components/wifi/wifi_service_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc index 523013e..a4a99d4 100644 --- a/components/wifi/wifi_service_win.cc +++ b/components/wifi/wifi_service_win.cc @@ -1256,7 +1256,7 @@ std::string WiFiServiceImpl::SecurityFromDot11AuthAlg( case DOT11_AUTH_ALGO_80211_SHARED_KEY: return onc::wifi::kWEP_PSK; case DOT11_AUTH_ALGO_80211_OPEN: - return onc::wifi::kNone; + return onc::wifi::kSecurityNone; default: return onc::wifi::kWPA_EAP; } @@ -1600,7 +1600,7 @@ DWORD WiFiServiceImpl::Connect(const std::string& network_guid, if (error_string.empty() && properties->GetDictionary(onc::network_type::kWiFi, &wifi) && wifi->GetString(onc::wifi::kSecurity, &wifi_security) && - wifi_security != onc::wifi::kNone) { + wifi_security != onc::wifi::kSecurityNone) { error = ERROR_ACCESS_DENIED; LOG(ERROR) << error; return error; @@ -1743,7 +1743,7 @@ bool WiFiServiceImpl::AuthEncryptionFromSecurity( std::string* authentication, std::string* encryption, std::string* key_type) const { - if (security == onc::wifi::kNone) { + if (security == onc::wifi::kSecurityNone) { *authentication = kAuthenticationOpen; *encryption = kEncryptionNone; } else if (security == onc::wifi::kWEP_PSK) { |