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

Unified Diff: remoting/protocol/me2me_host_authenticator_factory.cc

Issue 1755273003: Simplify AuthenticationMethod type and PIN hash handling. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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/me2me_host_authenticator_factory.cc
diff --git a/remoting/protocol/me2me_host_authenticator_factory.cc b/remoting/protocol/me2me_host_authenticator_factory.cc
index bd31a0d25584b52babbf2c804f1b37f18df3d397..56e96317ac01bbc5b7f051be5fe358709cd7bcc9 100644
--- a/remoting/protocol/me2me_host_authenticator_factory.cc
+++ b/remoting/protocol/me2me_host_authenticator_factory.cc
@@ -20,14 +20,13 @@ namespace remoting {
namespace protocol {
// static
-scoped_ptr<AuthenticatorFactory>
-Me2MeHostAuthenticatorFactory::CreateWithSharedSecret(
+scoped_ptr<AuthenticatorFactory> Me2MeHostAuthenticatorFactory::CreateWithPin(
bool use_service_account,
const std::string& host_owner,
const std::string& local_cert,
scoped_refptr<RsaKeyPair> key_pair,
const std::string& required_client_domain,
- const SharedSecretHash& shared_secret_hash,
+ const std::string& pin_hash,
scoped_refptr<PairingRegistry> pairing_registry) {
scoped_ptr<Me2MeHostAuthenticatorFactory> result(
new Me2MeHostAuthenticatorFactory());
@@ -36,7 +35,7 @@ Me2MeHostAuthenticatorFactory::CreateWithSharedSecret(
result->local_cert_ = local_cert;
result->key_pair_ = key_pair;
result->required_client_domain_ = required_client_domain;
- result->shared_secret_hash_ = shared_secret_hash;
+ result->pin_hash_ = pin_hash;
result->pairing_registry_ = pairing_registry;
return std::move(result);
}
@@ -128,9 +127,8 @@ scoped_ptr<Authenticator> Me2MeHostAuthenticatorFactory::CreateAuthenticator(
local_jid, remote_jid));
}
- return NegotiatingHostAuthenticator::CreateWithSharedSecret(
- local_cert_, key_pair_, shared_secret_hash_.value,
- shared_secret_hash_.hash_function, pairing_registry_);
+ return NegotiatingHostAuthenticator::CreateWithPin(
+ local_cert_, key_pair_, pin_hash_, pairing_registry_);
}
return make_scoped_ptr(

Powered by Google App Engine
This is Rietveld 408576698