Skip to content

Commit

Permalink
Rename VerifyAndSign* functions to VerifyAndEncrypt*
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
gspencer@chromium.org committed Mar 2, 2013
1 parent fa6496c commit 66e87ac
Show file tree
Hide file tree
Showing 13 changed files with 73 additions and 71 deletions.
2 changes: 1 addition & 1 deletion DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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":
Expand Down
51 changes: 26 additions & 25 deletions chrome/browser/chromeos/extensions/networking_private_api.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,80 +376,81 @@ void NetworkingPrivateVerifyDestinationFunction::ErrorCallback(
}

////////////////////////////////////////////////////////////////////////////////
// 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,
params->properties.signed_data,
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,
params->properties.signed_data,
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);
Expand Down
29 changes: 15 additions & 14 deletions chrome/browser/chromeos/extensions/networking_private_api.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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_
8 changes: 4 additions & 4 deletions chrome/browser/chromeos/extensions/networking_private_apitest.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
}


Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/extensions/extension_function_histogram_value.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions chrome/common/extensions/api/networking_private.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"type": "string",
"description": "A string containing the serial number of the device."
}
}
}
}
],
"functions": [
Expand Down Expand Up @@ -148,7 +148,7 @@
]
},
{
"name": "verifyAndSignCredentials",
"name": "verifyAndEncryptCredentials",
"description": "Verifies that the device is a trusted device and retrieves encrypted network credentials.",
"parameters": [
{
Expand All @@ -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": [
{
Expand Down
8 changes: 4 additions & 4 deletions chrome/test/data/extensions/api_test/networking/test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions chromeos/dbus/mock_shill_manager_client.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions chromeos/dbus/shill_manager_client.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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);
Expand All @@ -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,
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions chromeos/dbus/shill_manager_client.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions chromeos/dbus/shill_manager_client_stub.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions chromeos/dbus/shill_manager_client_stub.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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,
Expand Down
Loading

0 comments on commit 66e87ac

Please sign in to comment.