Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Unified Diff: components/cryptauth/device_to_device_authenticator.h

Issue 2899863002: Updating D2D protocol to v1 to support separate sequence numbers. (Closed)
Patch Set: Fixing tests Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/cryptauth/device_to_device_authenticator.h
diff --git a/components/cryptauth/device_to_device_authenticator.h b/components/cryptauth/device_to_device_authenticator.h
index e398206b2bab3384a0feb345a58eb1461cf6ec56..b01a977ed0a3967120685dcfdf88fc5c1bfb552a 100644
--- a/components/cryptauth/device_to_device_authenticator.h
+++ b/components/cryptauth/device_to_device_authenticator.h
@@ -5,6 +5,8 @@
#ifndef COMPONENTS_CRYPTAUTH_DEVICE_TO_DEVICE_AUTHENTICATOR_H_
#define COMPONENTS_CRYPTAUTH_DEVICE_TO_DEVICE_AUTHENTICATOR_H_
+#include <memory>
+
#include "base/callback.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -18,6 +20,7 @@ class Timer;
namespace cryptauth {
class SecureMessageDelegate;
+class SessionKeys;
}
namespace cryptauth {
@@ -110,7 +113,7 @@ class DeviceToDeviceAuthenticator : public Authenticator,
// Callback for validating the received [Remote Auth].
void OnResponderAuthValidated(bool validated,
- const std::string& session_symmetric_key);
+ std::unique_ptr<SessionKeys> session_keys);
// Callback when [Initiator Auth] is created.
void OnInitiatorAuthCreated(const std::string& message);
@@ -169,7 +172,7 @@ class DeviceToDeviceAuthenticator : public Authenticator,
std::string local_session_private_key_;
// The derived symmetric key for the session.
Tim Song 2017/05/22 23:18:24 nit: s/key/keys
sacomoto 2017/05/23 09:50:13 Done.
- std::string session_symmetric_key_;
+ std::unique_ptr<SessionKeys> session_keys_;
base::WeakPtrFactory<DeviceToDeviceAuthenticator> weak_ptr_factory_;

Powered by Google App Engine
This is Rietveld 408576698