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

Unified Diff: remoting/protocol/negotiating_host_authenticator.h

Issue 14793021: PairingAuthenticator implementation and plumbing. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed clang errors. Created 7 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: remoting/protocol/negotiating_host_authenticator.h
diff --git a/remoting/protocol/negotiating_host_authenticator.h b/remoting/protocol/negotiating_host_authenticator.h
index 588fee2bf0e390bdb640bfb801cd15337a9712d3..ede3e8e129eef17b420bdc633c30a0e3f7881e18 100644
--- a/remoting/protocol/negotiating_host_authenticator.h
+++ b/remoting/protocol/negotiating_host_authenticator.h
@@ -11,10 +11,10 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
#include "remoting/protocol/authentication_method.h"
#include "remoting/protocol/authenticator.h"
#include "remoting/protocol/negotiating_authenticator_base.h"
+#include "remoting/protocol/pairing_registry.h"
#include "remoting/protocol/third_party_host_authenticator.h"
namespace remoting {
@@ -30,11 +30,14 @@ class NegotiatingHostAuthenticator : public NegotiatingAuthenticatorBase {
virtual ~NegotiatingHostAuthenticator();
// Creates a host authenticator, using a fixed shared secret/PIN hash.
+ // If |pairing_registry| is non-NULL then the Spake2Pair method will
+ // be offered, supporting PIN-less authentication.
static scoped_ptr<Authenticator> CreateWithSharedSecret(
const std::string& local_cert,
scoped_refptr<RsaKeyPair> key_pair,
const std::string& shared_secret_hash,
- AuthenticationMethod::HashFunction hash_function);
+ AuthenticationMethod::HashFunction hash_function,
+ scoped_refptr<PairingRegistry> pairing_registry);
// Creates a host authenticator, using third party authentication.
static scoped_ptr<Authenticator> CreateWithThirdPartyAuth(
@@ -68,6 +71,9 @@ class NegotiatingHostAuthenticator : public NegotiatingAuthenticatorBase {
// Used only for third party host authenticators.
scoped_ptr<ThirdPartyHostAuthenticator::TokenValidator> token_validator_;
+ // Used only for pairing authenticators.
+ scoped_refptr<PairingRegistry> pairing_registry_;
+
DISALLOW_COPY_AND_ASSIGN(NegotiatingHostAuthenticator);
};
« no previous file with comments | « remoting/protocol/negotiating_client_authenticator.cc ('k') | remoting/protocol/negotiating_host_authenticator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698