diff options
| author | noamsml <noamsml@chromium.org> | 2014-08-29 15:45:34 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-29 23:04:14 +0000 |
| commit | 8383a9849bd233d0c1792375e13d5243434826bc (patch) | |
| tree | 56f0e9f451c86cca20cef7812c038d44e0af5339 /chrome/utility | |
| parent | d85710844c00acbfcf95f84ebcb6012d72eac645 (diff) | |
| download | chromium_src-8383a9849bd233d0c1792375e13d5243434826bc.zip chromium_src-8383a9849bd233d0c1792375e13d5243434826bc.tar.gz chromium_src-8383a9849bd233d0c1792375e13d5243434826bc.tar.bz2 | |
Pass credentials for WifiManager in Windows.
BUG=370071
Review URL: https://codereview.chromium.org/343053002
Cr-Commit-Position: refs/heads/master@{#292700}
Diffstat (limited to 'chrome/utility')
| -rw-r--r-- | chrome/utility/chrome_content_utility_ipc_whitelist.cc | 2 | ||||
| -rw-r--r-- | chrome/utility/extensions/extensions_handler.cc | 18 | ||||
| -rw-r--r-- | chrome/utility/extensions/extensions_handler.h | 3 |
3 files changed, 6 insertions, 17 deletions
diff --git a/chrome/utility/chrome_content_utility_ipc_whitelist.cc b/chrome/utility/chrome_content_utility_ipc_whitelist.cc index 25c572e..7e2376a 100644 --- a/chrome/utility/chrome_content_utility_ipc_whitelist.cc +++ b/chrome/utility/chrome_content_utility_ipc_whitelist.cc @@ -11,7 +11,7 @@ const uint32 kMessageWhitelist[] = { #if defined(ENABLE_EXTENSIONS) #if defined(OS_WIN) - ChromeUtilityHostMsg_GetAndEncryptWiFiCredentials::ID, + ChromeUtilityHostMsg_GetWiFiCredentials::ID, #endif // defined(OS_WIN) ChromeUtilityMsg_ImageWriter_Cancel::ID, ChromeUtilityMsg_ImageWriter_Write::ID, diff --git a/chrome/utility/extensions/extensions_handler.cc b/chrome/utility/extensions/extensions_handler.cc index 25f65a7..e8ef09f 100644 --- a/chrome/utility/extensions/extensions_handler.cc +++ b/chrome/utility/extensions/extensions_handler.cc @@ -111,8 +111,8 @@ bool ExtensionsHandler::OnMessageReceived(const IPC::Message& message) { #endif // defined(OS_WIN) || defined(OS_MACOSX) #if defined(OS_WIN) - IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_GetAndEncryptWiFiCredentials, - OnGetAndEncryptWiFiCredentials) + IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_GetWiFiCredentials, + OnGetWiFiCredentials) #endif // defined(OS_WIN) IPC_MESSAGE_UNHANDLED(handled = false) @@ -282,9 +282,7 @@ void ExtensionsHandler::OnIndexPicasaAlbumsContents( #endif // defined(OS_WIN) || defined(OS_MACOSX) #if defined(OS_WIN) -void ExtensionsHandler::OnGetAndEncryptWiFiCredentials( - const std::string& network_guid, - const std::vector<uint8>& public_key) { +void ExtensionsHandler::OnGetWiFiCredentials(const std::string& network_guid) { scoped_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create()); wifi_service->Initialize(NULL); @@ -292,15 +290,7 @@ void ExtensionsHandler::OnGetAndEncryptWiFiCredentials( std::string error; wifi_service->GetKeyFromSystem(network_guid, &key_data, &error); - std::vector<uint8> ciphertext; - bool success = error.empty() && !key_data.empty(); - if (success) { - success = networking_private_crypto::EncryptByteString( - public_key, key_data, &ciphertext); - } - - Send(new ChromeUtilityHostMsg_GotEncryptedWiFiCredentials(ciphertext, - success)); + Send(new ChromeUtilityHostMsg_GotWiFiCredentials(key_data, error.empty())); } #endif // defined(OS_WIN) diff --git a/chrome/utility/extensions/extensions_handler.h b/chrome/utility/extensions/extensions_handler.h index bc06a100..7789857 100644 --- a/chrome/utility/extensions/extensions_handler.h +++ b/chrome/utility/extensions/extensions_handler.h @@ -68,8 +68,7 @@ class ExtensionsHandler : public UtilityMessageHandler { #endif // defined(OS_WIN) || defined(OS_MACOSX) #if defined(OS_WIN) - void OnGetAndEncryptWiFiCredentials(const std::string& network_guid, - const std::vector<uint8>& public_key); + void OnGetWiFiCredentials(const std::string& network_guid); #endif // defined(OS_WIN) DISALLOW_COPY_AND_ASSIGN(ExtensionsHandler); |