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

Unified Diff: remoting/protocol/it2me_host_authenticator_factory.cc

Issue 10830184: Remove V1 authenticators (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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
« no previous file with comments | « remoting/protocol/authentication_method.h ('k') | remoting/protocol/me2me_host_authenticator_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/it2me_host_authenticator_factory.cc
diff --git a/remoting/protocol/it2me_host_authenticator_factory.cc b/remoting/protocol/it2me_host_authenticator_factory.cc
index 19853cee75a316261f031f87bd617e137b34080a..cc8a0b5d7ca6b614c30193c09e5cdbba09860c1b 100644
--- a/remoting/protocol/it2me_host_authenticator_factory.cc
+++ b/remoting/protocol/it2me_host_authenticator_factory.cc
@@ -6,7 +6,6 @@
#include "base/logging.h"
#include "crypto/rsa_private_key.h"
-#include "remoting/protocol/v1_authenticator.h"
#include "remoting/protocol/negotiating_authenticator.h"
namespace remoting {
@@ -28,14 +27,9 @@ scoped_ptr<Authenticator> It2MeHostAuthenticatorFactory::CreateAuthenticator(
const std::string& local_jid,
const std::string& remote_jid,
const buzz::XmlElement* first_message) {
- if (NegotiatingAuthenticator::IsNegotiableMessage(first_message)) {
- return NegotiatingAuthenticator::CreateForHost(
- local_cert_, *local_private_key_, shared_secret_,
- AuthenticationMethod::NONE);
- }
-
- return scoped_ptr<Authenticator>(new V1HostAuthenticator(
- local_cert_, *local_private_key_, shared_secret_, remote_jid));
+ return NegotiatingAuthenticator::CreateForHost(
+ local_cert_, *local_private_key_, shared_secret_,
+ AuthenticationMethod::NONE);
}
} // namespace protocol
« no previous file with comments | « remoting/protocol/authentication_method.h ('k') | remoting/protocol/me2me_host_authenticator_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698