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)
[email protected],[email protected]
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
diff --git a/DEPS b/DEPS
index 9852a31..93dc546 100644
--- a/DEPS
+++ b/DEPS
@@ -550,7 +550,7 @@
# 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 a1a669b..07a3c8d 100644
--- a/chrome/browser/chromeos/extensions/networking_private_api.cc
+++ b/chrome/browser/chromeos/extensions/networking_private_api.cc
@@ -376,18 +376,19 @@
}
////////////////////////////////////////////////////////////////////////////////
-// NetworkingPrivateVerifyAndSignCredentialsFunction
+// NetworkingPrivateVerifyAndEncryptCredentialsFunction
-NetworkingPrivateVerifyAndSignCredentialsFunction::
- ~NetworkingPrivateVerifyAndSignCredentialsFunction() {
+NetworkingPrivateVerifyAndEncryptCredentialsFunction::
+ ~NetworkingPrivateVerifyAndEncryptCredentialsFunction() {
}
-bool NetworkingPrivateVerifyAndSignCredentialsFunction::RunImpl() {
- scoped_ptr<api::VerifyAndSignCredentials::Params> params =
- api::VerifyAndSignCredentials::Params::Create(*args_);
+bool NetworkingPrivateVerifyAndEncryptCredentialsFunction::RunImpl() {
+ scoped_ptr<api::VerifyAndEncryptCredentials::Params> 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 @@
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<api::VerifyAndSignData::Params> params =
- api::VerifyAndSignData::Params::Create(*args_);
+bool NetworkingPrivateVerifyAndEncryptDataFunction::RunImpl() {
+ scoped_ptr<api::VerifyAndEncryptData::Params> 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 @@
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 17662771..9ae9221b 100644
--- a/chrome/browser/chromeos/extensions/networking_private_api.h
+++ b/chrome/browser/chromeos/extensions/networking_private_api.h
@@ -138,16 +138,16 @@
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 @@
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 @@
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 c49ff0c..40cf2ee 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,
- 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 4aeb4355..d1babe8 100644
--- a/chrome/browser/extensions/extension_function_histogram_value.h
+++ b/chrome/browser/extensions/extension_function_histogram_value.h
@@ -480,8 +480,8 @@
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 3130d32..53ecbc9cf 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 c1c827c3..420e25e1 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 @@
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 5536870d..61791686 100644
--- a/chromeos/dbus/mock_shill_manager_client.h
+++ b/chromeos/dbus/mock_shill_manager_client.h
@@ -51,7 +51,7 @@
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 @@
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 5ef8556..04d7bcf 100644
--- a/chromeos/dbus/shill_manager_client.cc
+++ b/chromeos/dbus/shill_manager_client.cc
@@ -189,7 +189,7 @@
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 @@
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 @@
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 @@
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 899ccef3..db40be3e 100644
--- a/chromeos/dbus/shill_manager_client.h
+++ b/chromeos/dbus/shill_manager_client.h
@@ -142,7 +142,7 @@
// 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 @@
// 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 7cad8b1..9132e9e9 100644
--- a/chromeos/dbus/shill_manager_client_stub.cc
+++ b/chromeos/dbus/shill_manager_client_stub.cc
@@ -186,7 +186,7 @@
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 @@
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 9bb01e1..b9e7a6a 100644
--- a/chromeos/dbus/shill_manager_client_stub.h
+++ b/chromeos/dbus/shill_manager_client_stub.h
@@ -61,7 +61,7 @@
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 @@
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 9ba2dd3..d1730a1 100644
--- a/chromeos/dbus/shill_manager_client_unittest.cc
+++ b/chromeos/dbus/shill_manager_client_unittest.cc
@@ -454,7 +454,7 @@
message_loop_.RunUntilIdle();
}
-TEST_F(ShillManagerClientTest, VerifyAndSignCredentials) {
+TEST_F(ShillManagerClientTest, VerifyAndEncryptCredentials) {
// Create response.
scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
dbus::MessageWriter writer(response.get());
@@ -469,7 +469,7 @@
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 @@
// Call method.
MockErrorCallback mock_error_callback;
- client_->VerifyAndSignCredentials(arguments[0],
+ client_->VerifyAndEncryptCredentials(arguments[0],
arguments[1],
arguments[2],
arguments[3],
@@ -493,7 +493,7 @@
message_loop_.RunUntilIdle();
}
-TEST_F(ShillManagerClientTest, VerifyAndSignData) {
+TEST_F(ShillManagerClientTest, VerifyAndEncryptData) {
// Create response.
scoped_ptr<dbus::Response> response(dbus::Response::CreateEmpty());
dbus::MessageWriter writer(response.get());
@@ -507,14 +507,14 @@
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],
