diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 02:16:45 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 02:16:45 +0000 |
| commit | 8db04987509e981472144182ec0e96c2a3abc218 (patch) | |
| tree | a0f4290aa4063894f4023a635c2a3a6ff06aec5d /remoting | |
| parent | 23b95dc052caad716cc07db46919e288de05232e (diff) | |
| download | chromium_src-8db04987509e981472144182ec0e96c2a3abc218.zip chromium_src-8db04987509e981472144182ec0e96c2a3abc218.tar.gz chromium_src-8db04987509e981472144182ec0e96c2a3abc218.tar.bz2 | |
Enable NegotiatingAuthentication in It2Me host.
BUG=105214
Review URL: https://chromiumcodereview.appspot.com/9113047
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119819 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/protocol/it2me_host_authenticator_factory.cc | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/remoting/protocol/it2me_host_authenticator_factory.cc b/remoting/protocol/it2me_host_authenticator_factory.cc index 64c928c..9599556 100644 --- a/remoting/protocol/it2me_host_authenticator_factory.cc +++ b/remoting/protocol/it2me_host_authenticator_factory.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "crypto/rsa_private_key.h" #include "remoting/protocol/v1_authenticator.h" -#include "remoting/protocol/v2_authenticator.h" +#include "remoting/protocol/negotiating_authenticator.h" namespace remoting { namespace protocol { @@ -27,13 +27,11 @@ It2MeHostAuthenticatorFactory::~It2MeHostAuthenticatorFactory() { scoped_ptr<Authenticator> It2MeHostAuthenticatorFactory::CreateAuthenticator( const std::string& remote_jid, const buzz::XmlElement* first_message) { - // TODO(sergeyu): V2 authenticator is not finished yet. Enable it - // here when it is finished. crbug.com/105214 - // - // if (V2Authenticator::IsEkeMessage(first_message)) { - // return V2Authenticator::CreateForHost( - // local_cert_, *local_private_key_, shared_secret_); - // } + 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)); |