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

Unified Diff: remoting/protocol/me2me_host_authenticator_factory.cc

Issue 10453080: Revert 139424 - Remove V1 authenticators. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 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
« no previous file with comments | « remoting/protocol/it2me_host_authenticator_factory.cc ('k') | remoting/protocol/v1_authenticator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/me2me_host_authenticator_factory.cc
===================================================================
--- remoting/protocol/me2me_host_authenticator_factory.cc (revision 139575)
+++ remoting/protocol/me2me_host_authenticator_factory.cc (working copy)
@@ -9,6 +9,7 @@
#include "crypto/rsa_private_key.h"
#include "remoting/protocol/channel_authenticator.h"
#include "remoting/protocol/negotiating_authenticator.h"
+#include "remoting/protocol/v1_authenticator.h"
#include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
namespace remoting {
@@ -89,6 +90,16 @@
return scoped_ptr<Authenticator>(new RejectingAuthenticator());
}
+ if (shared_secret_hash_.hash_function == AuthenticationMethod::NONE &&
+ shared_secret_hash_.value.empty()) {
+ // PIN isn't set. Enable V1 authentication.
+ if (!NegotiatingAuthenticator::IsNegotiableMessage(first_message)) {
+ return scoped_ptr<Authenticator>(
+ new V1HostAuthenticator(local_cert_, *local_private_key_,
+ "", remote_jid));
+ }
+ }
+
return NegotiatingAuthenticator::CreateForHost(
local_cert_, *local_private_key_, shared_secret_hash_.value,
shared_secret_hash_.hash_function);
« no previous file with comments | « remoting/protocol/it2me_host_authenticator_factory.cc ('k') | remoting/protocol/v1_authenticator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698