summaryrefslogtreecommitdiffstats
path: root/remoting
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-07 03:56:20 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-07 03:56:20 +0000
commit099a5ca5f24b8458da27ae32d7fa1f56e8d55f15 (patch)
treebb80adc4a1609b9f01192ed60b228eb1d70d9c5a /remoting
parent4fa6b7cb2d4384df9f3ddd11d88564979fd92d4b (diff)
downloadchromium_src-099a5ca5f24b8458da27ae32d7fa1f56e8d55f15.zip
chromium_src-099a5ca5f24b8458da27ae32d7fa1f56e8d55f15.tar.gz
chromium_src-099a5ca5f24b8458da27ae32d7fa1f56e8d55f15.tar.bz2
Remove V1 authenticator support from Me2Me host.
BUG=110483 Review URL: https://chromiumcodereview.appspot.com/9332017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
-rw-r--r--remoting/protocol/me2me_host_authenticator_factory.cc13
1 files changed, 3 insertions, 10 deletions
diff --git a/remoting/protocol/me2me_host_authenticator_factory.cc b/remoting/protocol/me2me_host_authenticator_factory.cc
index 9a6f60b..5aa93cd0 100644
--- a/remoting/protocol/me2me_host_authenticator_factory.cc
+++ b/remoting/protocol/me2me_host_authenticator_factory.cc
@@ -107,16 +107,9 @@ scoped_ptr<Authenticator> Me2MeHostAuthenticatorFactory::CreateAuthenticator(
return scoped_ptr<Authenticator>(new RejectingAuthenticator());
}
- if (NegotiatingAuthenticator::IsNegotiableMessage(first_message)) {
- return NegotiatingAuthenticator::CreateForHost(
- local_cert_, *local_private_key_, shared_secret_hash_.value,
- shared_secret_hash_.hash_function);
- }
-
- // TODO(sergeyu): Old clients still use V1 auth protocol. Remove
- // this once we are done migrating to V2. crbug.com/110483 .
- 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);
}
} // namespace protocol