diff options
| author | sergeyu <sergeyu@chromium.org> | 2016-03-16 14:54:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-16 21:55:50 +0000 |
| commit | df644193ff164f1d3df85d857f2b21b5ba51f77e (patch) | |
| tree | fac5307a6e3ba594686023ddc4e9bfa4d3346391 /remoting/client | |
| parent | b9bf377e238af579e4b6dd01cb4007ba712da742 (diff) | |
| download | chromium_src-df644193ff164f1d3df85d857f2b21b5ba51f77e.zip chromium_src-df644193ff164f1d3df85d857f2b21b5ba51f77e.tar.gz chromium_src-df644193ff164f1d3df85d857f2b21b5ba51f77e.tar.bz2 | |
Normalize JIDs passed to Spake2Authenticator.
Spake2Authenticator requires that local_id and remote_id are the same
on both ends of the connection, so JIDs need to be normalized to avoid
issues when one of the ends gets JID in a different case.
BUG=589698
Review URL: https://codereview.chromium.org/1803893002
Cr-Commit-Position: refs/heads/master@{#381559}
Diffstat (limited to 'remoting/client')
| -rw-r--r-- | remoting/client/chromoting_client.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc index 1f7165a..eedd1c9 100644 --- a/remoting/client/chromoting_client.cc +++ b/remoting/client/chromoting_client.cc @@ -21,6 +21,7 @@ #include "remoting/protocol/transport_context.h" #include "remoting/protocol/video_renderer.h" #include "remoting/protocol/webrtc_connection_to_host.h" +#include "remoting/signaling/jid_util.h" namespace remoting { @@ -61,7 +62,7 @@ void ChromotingClient::Start( DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(!session_manager_); // Start must be called more than once. - host_jid_ = host_jid; + host_jid_ = NormalizeJid(host_jid); local_capabilities_ = capabilities; if (!protocol_config_) @@ -216,7 +217,7 @@ void ChromotingClient::StartConnection() { session_manager_->Connect( host_jid_, make_scoped_ptr(new protocol::NegotiatingClientAuthenticator( - signal_strategy_->GetLocalJid(), host_jid_, + NormalizeJid(signal_strategy_->GetLocalJid()), host_jid_, client_auth_config_))), transport_context_, this); } |