summaryrefslogtreecommitdiff
path: root/crypto_util_proxy.h
diff options
context:
space:
mode:
authorPaul Stewart <pstew@chromium.org>2015-06-16 13:13:10 -0700
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-06-18 08:08:09 +0000
commita794cd60a7339d576ea2eed263a4f0a20fb255af (patch)
treeca317904a41fbff94b46d40933daca2208ada713 /crypto_util_proxy.h
parent3b30ca58d13cf66b75ba0729b222ddc42ae68b33 (diff)
downloadshill-a794cd60a7339d576ea2eed263a4f0a20fb255af.tar.gz
shill: Top-level files a-e: Switch pointer/ref spacing
Switch to Chrome style spacing. BUG=chromium:501026 TEST=Unit tests Change-Id: Idb7252202e142098999fe0672712aded7d369259 Reviewed-on: https://chromium-review.googlesource.com/278038 Reviewed-by: Rebecca Silberstein <silberst@chromium.org> Commit-Queue: Paul Stewart <pstew@chromium.org> Tested-by: Paul Stewart <pstew@chromium.org>
Diffstat (limited to 'crypto_util_proxy.h')
-rw-r--r--crypto_util_proxy.h68
1 files changed, 34 insertions, 34 deletions
diff --git a/crypto_util_proxy.h b/crypto_util_proxy.h
index 757902d4..f493abab 100644
--- a/crypto_util_proxy.h
+++ b/crypto_util_proxy.h
@@ -34,7 +34,7 @@ class CryptoUtilProxy : public base::SupportsWeakPtr<CryptoUtilProxy> {
static const char kCommandEncrypt[];
static const char kCryptoUtilShimPath[];
- CryptoUtilProxy(EventDispatcher *dispatcher, GLib *glib);
+ CryptoUtilProxy(EventDispatcher* dispatcher, GLib* glib);
virtual ~CryptoUtilProxy();
// Verify credentials for the currently connected endpoint of
@@ -50,15 +50,15 @@ class CryptoUtilProxy : public base::SupportsWeakPtr<CryptoUtilProxy> {
// |destination_udn| has no format requirements.
// |ssid| has no constraints.
// |bssid| should be in the human readable format: 00:11:22:33:44:55.
- virtual bool VerifyDestination(const std::string &certificate,
- const std::string &public_key,
- const std::string &nonce,
- const std::string &signed_data,
- const std::string &destination_udn,
- const std::vector<uint8_t> &ssid,
- const std::string &bssid,
- const ResultBoolCallback &result_callback,
- Error *error);
+ virtual bool VerifyDestination(const std::string& certificate,
+ const std::string& public_key,
+ const std::string& nonce,
+ const std::string& signed_data,
+ const std::string& destination_udn,
+ const std::vector<uint8_t>& ssid,
+ const std::string& bssid,
+ const ResultBoolCallback& result_callback,
+ Error* error);
// Encrypt |data| under |public_key|. This is a fairly time consuming
// process. Returns true if we've succeeded in kicking off a job to an
@@ -68,10 +68,10 @@ class CryptoUtilProxy : public base::SupportsWeakPtr<CryptoUtilProxy> {
//
// |public_key| is a base64 encoded DER RSAPublicKey format public key.
// |data| has no particular format requirements.
- virtual bool EncryptData(const std::string &public_key,
- const std::string &data,
- const ResultStringCallback &result_callback,
- Error *error);
+ virtual bool EncryptData(const std::string& public_key,
+ const std::string& data,
+ const ResultStringCallback& result_callback,
+ Error* error);
private:
friend class CryptoUtilProxyTest;
@@ -88,7 +88,7 @@ class CryptoUtilProxy : public base::SupportsWeakPtr<CryptoUtilProxy> {
// Helper method for parsing the proto buffer return codes sent back by the
// shim.
- static bool ParseResponseReturnCode(int proto_return_code, Error *e);
+ static bool ParseResponseReturnCode(int proto_return_code, Error* e);
// Kick off a run of the shim to verify credentials or sign data. Callers
// pass in the command they want to run on the shim (literally a command line
@@ -96,36 +96,36 @@ class CryptoUtilProxy : public base::SupportsWeakPtr<CryptoUtilProxy> {
// called both on errors, timeouts, and success. Behind the scenes, we first
// send |input| down to the shim through a pipe to its stdin, then wait for
// bytes to comes back over a pipe connected to the shim's stdout.
- virtual bool StartShimForCommand(const std::string &command,
- const std::string &input,
- const StringCallback &result_handler);
+ virtual bool StartShimForCommand(const std::string& command,
+ const std::string& input,
+ const StringCallback& result_handler);
// This is the big hammer we use to clean up past shim state.
- virtual void CleanupShim(const Error &shim_result);
+ virtual void CleanupShim(const Error& shim_result);
virtual void OnShimDeath();
// Callbacks that handle IO operations between shill and the shim. Called by
// GLib on changes in file descriptor state.
void HandleShimStdinReady(int fd);
- void HandleShimOutput(InputData *data);
- void HandleShimReadError(const std::string &error_msg);
- void HandleShimError(const Error &error);
+ void HandleShimOutput(InputData* data);
+ void HandleShimReadError(const std::string& error_msg);
+ void HandleShimError(const Error& error);
void HandleShimTimeout();
// Used to handle the final result of both operations. |result| is a
// seriallized protocol buffer or an empty string on error. On error,
// |error| is filled in with an appropriate error condition.
// |result_callback| is a callback from the original caller (the manager).
- void HandleVerifyResult(const ResultBoolCallback &result_handler,
- const std::string &result,
- const Error &error);
- void HandleEncryptResult(const ResultStringCallback &result_handler,
- const std::string &result,
- const Error &error);
-
- EventDispatcher *dispatcher_;
- GLib *glib_;
- chromeos::Minijail *minijail_;
- ProcessKiller *process_killer_;
- FileIO *file_io_;
+ void HandleVerifyResult(const ResultBoolCallback& result_handler,
+ const std::string& result,
+ const Error& error);
+ void HandleEncryptResult(const ResultStringCallback& result_handler,
+ const std::string& result,
+ const Error& error);
+
+ EventDispatcher* dispatcher_;
+ GLib* glib_;
+ chromeos::Minijail* minijail_;
+ ProcessKiller* process_killer_;
+ FileIO* file_io_;
std::string input_buffer_;
std::string::const_iterator next_input_byte_;
std::string output_buffer_;