From 66e87ac1b1366736c036faf226fee96da5d9bc8b Mon Sep 17 00:00:00 2001 From: "gspencer@chromium.org" Date: Sat, 2 Mar 2013 20:50:39 +0000 Subject: [PATCH] Rename VerifyAndSign* functions to VerifyAndEncrypt* since that is a more accurate description (and it's what the Shill APIs are now named). (TBR'ing OWNERS because this is a mechanical name change only) TBR=stevenjb@chromium.org,kalman@chromium.org BUG=chromium-os:38993,chromium:179193 TEST=built chrome Review URL: https://chromiumcodereview.appspot.com/12381026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185775 0039d316-1c4b-4281-b951-d872f2087c98 --- DEPS | 2 +- .../extensions/networking_private_api.cc | 51 ++++++++++--------- .../extensions/networking_private_api.h | 29 ++++++----- .../extensions/networking_private_apitest.cc | 8 +-- .../extension_function_histogram_value.h | 4 +- .../extensions/api/networking_private.json | 6 +-- .../extensions/api_test/networking/test.js | 8 +-- chromeos/dbus/mock_shill_manager_client.h | 4 +- chromeos/dbus/shill_manager_client.cc | 8 +-- chromeos/dbus/shill_manager_client.h | 4 +- chromeos/dbus/shill_manager_client_stub.cc | 4 +- chromeos/dbus/shill_manager_client_stub.h | 4 +- .../dbus/shill_manager_client_unittest.cc | 12 ++--- 13 files changed, 73 insertions(+), 71 deletions(-) diff --git a/DEPS b/DEPS index 9852a31c7e3638..93dc546677d53d 100644 --- a/DEPS +++ b/DEPS @@ -550,7 +550,7 @@ deps_os = { # For Linux and Chromium OS. "src/third_party/cros_system_api": Var("chromiumos_git") + "/platform/system_api.git" + - "@7d1185fa1b6f16d5e04fefc8be348682bad69b04", + "@bc8725f73a1a75ad863b73bc7a348d8bf7e8ba4e", # Note that this is different from Android's freetype repo. "src/third_party/freetype2/src": diff --git a/chrome/browser/chromeos/extensions/networking_private_api.cc b/chrome/browser/chromeos/extensions/networking_private_api.cc index a1a669b985008a..07a3c8d60e5b08 100644 --- a/chrome/browser/chromeos/extensions/networking_private_api.cc +++ b/chrome/browser/chromeos/extensions/networking_private_api.cc @@ -376,18 +376,19 @@ void NetworkingPrivateVerifyDestinationFunction::ErrorCallback( } //////////////////////////////////////////////////////////////////////////////// -// NetworkingPrivateVerifyAndSignCredentialsFunction +// NetworkingPrivateVerifyAndEncryptCredentialsFunction -NetworkingPrivateVerifyAndSignCredentialsFunction:: - ~NetworkingPrivateVerifyAndSignCredentialsFunction() { +NetworkingPrivateVerifyAndEncryptCredentialsFunction:: + ~NetworkingPrivateVerifyAndEncryptCredentialsFunction() { } -bool NetworkingPrivateVerifyAndSignCredentialsFunction::RunImpl() { - scoped_ptr params = - api::VerifyAndSignCredentials::Params::Create(*args_); +bool NetworkingPrivateVerifyAndEncryptCredentialsFunction::RunImpl() { + scoped_ptr params = + api::VerifyAndEncryptCredentials::Params::Create(*args_); EXTENSION_FUNCTION_VALIDATE(params); - - DBusThreadManager::Get()->GetShillManagerClient()->VerifyAndSignCredentials( + ShillManagerClient* shill_manager_client = + DBusThreadManager::Get()->GetShillManagerClient(); + shill_manager_client->VerifyAndEncryptCredentials( params->properties.certificate, params->properties.public_key, params->properties.nonce, @@ -395,39 +396,39 @@ bool NetworkingPrivateVerifyAndSignCredentialsFunction::RunImpl() { params->properties.device_serial, params->guid, base::Bind( - &NetworkingPrivateVerifyAndSignCredentialsFunction::ResultCallback, + &NetworkingPrivateVerifyAndEncryptCredentialsFunction::ResultCallback, this), base::Bind( - &NetworkingPrivateVerifyAndSignCredentialsFunction::ErrorCallback, + &NetworkingPrivateVerifyAndEncryptCredentialsFunction::ErrorCallback, this)); return true; } -void NetworkingPrivateVerifyAndSignCredentialsFunction::ResultCallback( +void NetworkingPrivateVerifyAndEncryptCredentialsFunction::ResultCallback( const std::string& result) { - results_ = api::VerifyAndSignCredentials::Results::Create(result); + results_ = api::VerifyAndEncryptCredentials::Results::Create(result); SendResponse(true); } -void NetworkingPrivateVerifyAndSignCredentialsFunction::ErrorCallback( +void NetworkingPrivateVerifyAndEncryptCredentialsFunction::ErrorCallback( const std::string& error_name, const std::string& error) { error_ = error_name; SendResponse(false); } //////////////////////////////////////////////////////////////////////////////// -// NetworkingPrivateVerifyAndSignDataFunction +// NetworkingPrivateVerifyAndEncryptDataFunction -NetworkingPrivateVerifyAndSignDataFunction:: - ~NetworkingPrivateVerifyAndSignDataFunction() { +NetworkingPrivateVerifyAndEncryptDataFunction:: + ~NetworkingPrivateVerifyAndEncryptDataFunction() { } -bool NetworkingPrivateVerifyAndSignDataFunction::RunImpl() { - scoped_ptr params = - api::VerifyAndSignData::Params::Create(*args_); +bool NetworkingPrivateVerifyAndEncryptDataFunction::RunImpl() { + scoped_ptr params = + api::VerifyAndEncryptData::Params::Create(*args_); EXTENSION_FUNCTION_VALIDATE(params); - DBusThreadManager::Get()->GetShillManagerClient()->VerifyAndSignData( + DBusThreadManager::Get()->GetShillManagerClient()->VerifyAndEncryptData( params->properties.certificate, params->properties.public_key, params->properties.nonce, @@ -435,21 +436,21 @@ bool NetworkingPrivateVerifyAndSignDataFunction::RunImpl() { params->properties.device_serial, params->data, base::Bind( - &NetworkingPrivateVerifyAndSignDataFunction::ResultCallback, + &NetworkingPrivateVerifyAndEncryptDataFunction::ResultCallback, this), base::Bind( - &NetworkingPrivateVerifyAndSignDataFunction::ErrorCallback, + &NetworkingPrivateVerifyAndEncryptDataFunction::ErrorCallback, this)); return true; } -void NetworkingPrivateVerifyAndSignDataFunction::ResultCallback( +void NetworkingPrivateVerifyAndEncryptDataFunction::ResultCallback( const std::string& result) { - results_ = api::VerifyAndSignData::Results::Create(result); + results_ = api::VerifyAndEncryptData::Results::Create(result); SendResponse(true); } -void NetworkingPrivateVerifyAndSignDataFunction::ErrorCallback( +void NetworkingPrivateVerifyAndEncryptDataFunction::ErrorCallback( const std::string& error_name, const std::string& error) { error_ = error_name; SendResponse(false); diff --git a/chrome/browser/chromeos/extensions/networking_private_api.h b/chrome/browser/chromeos/extensions/networking_private_api.h index 176627715d5320..9ae9221b26b179 100644 --- a/chrome/browser/chromeos/extensions/networking_private_api.h +++ b/chrome/browser/chromeos/extensions/networking_private_api.h @@ -138,16 +138,16 @@ class NetworkingPrivateVerifyDestinationFunction DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateVerifyDestinationFunction); }; -// Implements the chrome.networkingPrivate.verifyAndSignCredentials method. -class NetworkingPrivateVerifyAndSignCredentialsFunction +// Implements the chrome.networkingPrivate.verifyAndEncryptCredentials method. +class NetworkingPrivateVerifyAndEncryptCredentialsFunction : public AsyncExtensionFunction { public: - NetworkingPrivateVerifyAndSignCredentialsFunction() {} - DECLARE_EXTENSION_FUNCTION("networkingPrivate.verifyAndSignCredentials", - NETWORKINGPRIVATE_VERIFYANDSIGNCREDENTIALS); + NetworkingPrivateVerifyAndEncryptCredentialsFunction() {} + DECLARE_EXTENSION_FUNCTION("networkingPrivate.verifyAndEncryptCredentials", + NETWORKINGPRIVATE_VERIFYANDENCRYPTCREDENTIALS); protected: - virtual ~NetworkingPrivateVerifyAndSignCredentialsFunction(); + virtual ~NetworkingPrivateVerifyAndEncryptCredentialsFunction(); // AsyncExtensionFunction overrides. virtual bool RunImpl() OVERRIDE; @@ -156,19 +156,20 @@ class NetworkingPrivateVerifyAndSignCredentialsFunction void ErrorCallback(const std::string& error_name, const std::string& error); private: - DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateVerifyAndSignCredentialsFunction); + DISALLOW_COPY_AND_ASSIGN( + NetworkingPrivateVerifyAndEncryptCredentialsFunction); }; -// Implements the chrome.networkingPrivate.verifyAndSignData method. -class NetworkingPrivateVerifyAndSignDataFunction +// Implements the chrome.networkingPrivate.verifyAndEncryptData method. +class NetworkingPrivateVerifyAndEncryptDataFunction : public AsyncExtensionFunction { public: - NetworkingPrivateVerifyAndSignDataFunction() {} - DECLARE_EXTENSION_FUNCTION("networkingPrivate.verifyAndSignData", - NETWORKINGPRIVATE_VERIFYANDSIGNDATA); + NetworkingPrivateVerifyAndEncryptDataFunction() {} + DECLARE_EXTENSION_FUNCTION("networkingPrivate.verifyAndEncryptData", + NETWORKINGPRIVATE_VERIFYANDENCRYPTDATA); protected: - virtual ~NetworkingPrivateVerifyAndSignDataFunction(); + virtual ~NetworkingPrivateVerifyAndEncryptDataFunction(); // AsyncExtensionFunction overrides. virtual bool RunImpl() OVERRIDE; @@ -177,7 +178,7 @@ class NetworkingPrivateVerifyAndSignDataFunction void ErrorCallback(const std::string& error_name, const std::string& error); private: - DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateVerifyAndSignDataFunction); + DISALLOW_COPY_AND_ASSIGN(NetworkingPrivateVerifyAndEncryptDataFunction); }; #endif // CHROME_BROWSER_CHROMEOS_EXTENSIONS_NETWORKING_PRIVATE_API_H_ diff --git a/chrome/browser/chromeos/extensions/networking_private_apitest.cc b/chrome/browser/chromeos/extensions/networking_private_apitest.cc index c49ff0cd7fba9a..40cf2ee1b009ff 100644 --- a/chrome/browser/chromeos/extensions/networking_private_apitest.cc +++ b/chrome/browser/chromeos/extensions/networking_private_apitest.cc @@ -73,13 +73,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, } IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, - VerifyAndSignCredentials) { - EXPECT_TRUE(RunNetworkingSubtest("verifyAndSignCredentials")) << message_; + VerifyAndEncryptCredentials) { + EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptCredentials")) << message_; } IN_PROC_BROWSER_TEST_F(ExtensionNetworkingPrivateApiTest, - VerifyAndSignData) { - EXPECT_TRUE(RunNetworkingSubtest("verifyAndSignData")) << message_; + VerifyAndEncryptData) { + EXPECT_TRUE(RunNetworkingSubtest("verifyAndEncryptData")) << message_; } diff --git a/chrome/browser/extensions/extension_function_histogram_value.h b/chrome/browser/extensions/extension_function_histogram_value.h index 4aeb4355471c8b..d1babe810aaf65 100644 --- a/chrome/browser/extensions/extension_function_histogram_value.h +++ b/chrome/browser/extensions/extension_function_histogram_value.h @@ -480,8 +480,8 @@ enum HistogramValue { DEVELOPERPRIVATE_CHOOSEPATH, DEVELOPERPRIVATE_PACKDIRECTORY, NETWORKINGPRIVATE_VERIFYDESTINATION, - NETWORKINGPRIVATE_VERIFYANDSIGNCREDENTIALS, - NETWORKINGPRIVATE_VERIFYANDSIGNDATA, + NETWORKINGPRIVATE_VERIFYANDENCRYPTCREDENTIALS, + NETWORKINGPRIVATE_VERIFYANDENCRYPTDATA, DEVELOPERPRIVATE_RESTART, DEVELOPERPRIVATE_ALLOWINCOGNITO, INPUT_IME_DELETESURROUNDINGTEXT, diff --git a/chrome/common/extensions/api/networking_private.json b/chrome/common/extensions/api/networking_private.json index 3130d320bf8096..53ecbc9cf65cb0 100644 --- a/chrome/common/extensions/api/networking_private.json +++ b/chrome/common/extensions/api/networking_private.json @@ -39,7 +39,7 @@ "type": "string", "description": "A string containing the serial number of the device." } - } + } } ], "functions": [ @@ -148,7 +148,7 @@ ] }, { - "name": "verifyAndSignCredentials", + "name": "verifyAndEncryptCredentials", "description": "Verifies that the device is a trusted device and retrieves encrypted network credentials.", "parameters": [ { @@ -175,7 +175,7 @@ ] }, { - "name": "verifyAndSignData", + "name": "verifyAndEncryptData", "description": "Verifies that the device is a trusted device and encrypts supplied data with device public key.", "parameters": [ { diff --git a/chrome/test/data/extensions/api_test/networking/test.js b/chrome/test/data/extensions/api_test/networking/test.js index c1c827c3ee5314..420e25e177b85a 100644 --- a/chrome/test/data/extensions/api_test/networking/test.js +++ b/chrome/test/data/extensions/api_test/networking/test.js @@ -197,16 +197,16 @@ var availableTests = [ assertTrue(isValid); })); }, - function verifyAndSignCredentials() { - chrome.networkingPrivate.verifyAndSignCredentials( + function verifyAndEncryptCredentials() { + chrome.networkingPrivate.verifyAndEncryptCredentials( verificationProperties, "guid", callbackPass(function(result) { assertEq("encrypted_credentials", result); })); }, - function verifyAndSignData() { - chrome.networkingPrivate.verifyAndSignData( + function verifyAndEncryptData() { + chrome.networkingPrivate.verifyAndEncryptData( verificationProperties, "data", callbackPass(function(result) { diff --git a/chromeos/dbus/mock_shill_manager_client.h b/chromeos/dbus/mock_shill_manager_client.h index 5536870d0351de..617916860ab952 100644 --- a/chromeos/dbus/mock_shill_manager_client.h +++ b/chromeos/dbus/mock_shill_manager_client.h @@ -51,7 +51,7 @@ class MockShillManagerClient : public ShillManagerClient { const std::string& device_serial, const BooleanCallback& callback, const ErrorCallback& error_callback)); - MOCK_METHOD8(VerifyAndSignCredentials, + MOCK_METHOD8(VerifyAndEncryptCredentials, void(const std::string& certificate, const std::string& public_key, const std::string& nonce, @@ -60,7 +60,7 @@ class MockShillManagerClient : public ShillManagerClient { const std::string& service_path, const StringCallback& callback, const ErrorCallback& error_callback)); - MOCK_METHOD8(VerifyAndSignData, void(const std::string& certificate, + MOCK_METHOD8(VerifyAndEncryptData, void(const std::string& certificate, const std::string& public_key, const std::string& nonce, const std::string& signed_data, diff --git a/chromeos/dbus/shill_manager_client.cc b/chromeos/dbus/shill_manager_client.cc index 5ef855613847b7..04d7bcfb447900 100644 --- a/chromeos/dbus/shill_manager_client.cc +++ b/chromeos/dbus/shill_manager_client.cc @@ -189,7 +189,7 @@ class ShillManagerClientImpl : public ShillManagerClient { error_callback); } - virtual void VerifyAndSignCredentials( + virtual void VerifyAndEncryptCredentials( const std::string& certificate, const std::string& public_key, const std::string& nonce, @@ -199,7 +199,7 @@ class ShillManagerClientImpl : public ShillManagerClient { const StringCallback& callback, const ErrorCallback& error_callback) OVERRIDE { dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface, - shill::kVerifyAndSignCredentialsFunction); + shill::kVerifyAndEncryptCredentialsFunction); dbus::MessageWriter writer(&method_call); writer.AppendString(certificate); writer.AppendString(public_key); @@ -212,7 +212,7 @@ class ShillManagerClientImpl : public ShillManagerClient { error_callback); } - virtual void VerifyAndSignData(const std::string& certificate, + virtual void VerifyAndEncryptData(const std::string& certificate, const std::string& public_key, const std::string& nonce, const std::string& signed_data, @@ -221,7 +221,7 @@ class ShillManagerClientImpl : public ShillManagerClient { const StringCallback& callback, const ErrorCallback& error_callback) OVERRIDE { dbus::MethodCall method_call(flimflam::kFlimflamManagerInterface, - shill::kVerifyAndSignDataFunction); + shill::kVerifyAndEncryptDataFunction); dbus::MessageWriter writer(&method_call); writer.AppendString(certificate); writer.AppendString(public_key); diff --git a/chromeos/dbus/shill_manager_client.h b/chromeos/dbus/shill_manager_client.h index 899ccef3e5fad5..db40be3e3c2977 100644 --- a/chromeos/dbus/shill_manager_client.h +++ b/chromeos/dbus/shill_manager_client.h @@ -142,7 +142,7 @@ class CHROMEOS_EXPORT ShillManagerClient { // return the encrypted credentials for connecting to the network represented // by the given |service_path|, encrypted using the |public_key| for the // trusted device. If the device is not trusted, return the empty string. - virtual void VerifyAndSignCredentials( + virtual void VerifyAndEncryptCredentials( const std::string& certificate, const std::string& public_key, const std::string& nonce, @@ -155,7 +155,7 @@ class CHROMEOS_EXPORT ShillManagerClient { // Verify that the given data corresponds to a trusted device, and return the // |data| encrypted using the |public_key| for the trusted device. If the // device is not trusted, return the empty string. - virtual void VerifyAndSignData(const std::string& certificate, + virtual void VerifyAndEncryptData(const std::string& certificate, const std::string& public_key, const std::string& nonce, const std::string& signed_data, diff --git a/chromeos/dbus/shill_manager_client_stub.cc b/chromeos/dbus/shill_manager_client_stub.cc index 7cad8b171f07c8..9132e9e922e73a 100644 --- a/chromeos/dbus/shill_manager_client_stub.cc +++ b/chromeos/dbus/shill_manager_client_stub.cc @@ -186,7 +186,7 @@ void ShillManagerClientStub::VerifyDestination( FROM_HERE, base::Bind(callback, true)); } -void ShillManagerClientStub::VerifyAndSignCredentials( +void ShillManagerClientStub::VerifyAndEncryptCredentials( const std::string& certificate, const std::string& public_key, const std::string& nonce, @@ -201,7 +201,7 @@ void ShillManagerClientStub::VerifyAndSignCredentials( FROM_HERE, base::Bind(callback, "encrypted_credentials")); } -void ShillManagerClientStub::VerifyAndSignData( +void ShillManagerClientStub::VerifyAndEncryptData( const std::string& certificate, const std::string& public_key, const std::string& nonce, diff --git a/chromeos/dbus/shill_manager_client_stub.h b/chromeos/dbus/shill_manager_client_stub.h index 9bb01e1d231513..b9e7a6a6968cbc 100644 --- a/chromeos/dbus/shill_manager_client_stub.h +++ b/chromeos/dbus/shill_manager_client_stub.h @@ -61,7 +61,7 @@ class ShillManagerClientStub : public ShillManagerClient, const std::string& device_serial, const BooleanCallback& callback, const ErrorCallback& error_callback) OVERRIDE; - virtual void VerifyAndSignCredentials( + virtual void VerifyAndEncryptCredentials( const std::string& certificate, const std::string& public_key, const std::string& nonce, @@ -70,7 +70,7 @@ class ShillManagerClientStub : public ShillManagerClient, const std::string& service_path, const StringCallback& callback, const ErrorCallback& error_callback) OVERRIDE; - virtual void VerifyAndSignData(const std::string& certificate, + virtual void VerifyAndEncryptData(const std::string& certificate, const std::string& public_key, const std::string& nonce, const std::string& signed_data, diff --git a/chromeos/dbus/shill_manager_client_unittest.cc b/chromeos/dbus/shill_manager_client_unittest.cc index 9ba2dd3f5a6116..d1730a116094e8 100644 --- a/chromeos/dbus/shill_manager_client_unittest.cc +++ b/chromeos/dbus/shill_manager_client_unittest.cc @@ -454,7 +454,7 @@ TEST_F(ShillManagerClientTest, VerifyDestination) { message_loop_.RunUntilIdle(); } -TEST_F(ShillManagerClientTest, VerifyAndSignCredentials) { +TEST_F(ShillManagerClientTest, VerifyAndEncryptCredentials) { // Create response. scoped_ptr response(dbus::Response::CreateEmpty()); dbus::MessageWriter writer(response.get()); @@ -469,7 +469,7 @@ TEST_F(ShillManagerClientTest, VerifyAndSignCredentials) { arguments.push_back("device_serial"); std::string service_path = "/"; dbus::ObjectPath service_path_obj(service_path); - PrepareForMethodCall(shill::kVerifyAndSignCredentialsFunction, + PrepareForMethodCall(shill::kVerifyAndEncryptCredentialsFunction, base::Bind(&ExpectStringArgumentsFollowedByObjectPath, arguments, service_path_obj), @@ -478,7 +478,7 @@ TEST_F(ShillManagerClientTest, VerifyAndSignCredentials) { // Call method. MockErrorCallback mock_error_callback; - client_->VerifyAndSignCredentials(arguments[0], + client_->VerifyAndEncryptCredentials(arguments[0], arguments[1], arguments[2], arguments[3], @@ -493,7 +493,7 @@ TEST_F(ShillManagerClientTest, VerifyAndSignCredentials) { message_loop_.RunUntilIdle(); } -TEST_F(ShillManagerClientTest, VerifyAndSignData) { +TEST_F(ShillManagerClientTest, VerifyAndEncryptData) { // Create response. scoped_ptr response(dbus::Response::CreateEmpty()); dbus::MessageWriter writer(response.get()); @@ -507,14 +507,14 @@ TEST_F(ShillManagerClientTest, VerifyAndSignData) { arguments.push_back("signed_data"); arguments.push_back("device_serial"); arguments.push_back("data"); - PrepareForMethodCall(shill::kVerifyAndSignDataFunction, + PrepareForMethodCall(shill::kVerifyAndEncryptDataFunction, base::Bind(&ExpectStringArguments, arguments), response.get()); // Call method. MockErrorCallback mock_error_callback; - client_->VerifyAndSignData(arguments[0], + client_->VerifyAndEncryptData(arguments[0], arguments[1], arguments[2], arguments[3],