summaryrefslogtreecommitdiffstats
path: root/remoting/protocol/connection_to_host.cc
diff options
context:
space:
mode:
authorwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-27 04:17:57 +0000
committerwez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-27 04:17:57 +0000
commit278a4e8244ff8105dd2fdd4f8c593b4bd6a34cee (patch)
tree97e93930cb2764e2038fb2780f1bbed121f30046 /remoting/protocol/connection_to_host.cc
parent2b7391e9c66a34a2757a6367a97da98697736831 (diff)
downloadchromium_src-278a4e8244ff8105dd2fdd4f8c593b4bd6a34cee.zip
chromium_src-278a4e8244ff8105dd2fdd4f8c593b4bd6a34cee.tar.gz
chromium_src-278a4e8244ff8105dd2fdd4f8c593b4bd6a34cee.tar.bz2
Add an authentication step to stream channel setup in JingleStreamConnector.
Fix JingleStreamConnector and JingleDatagramConnector tear-down semantics in case of failure. BUG=88130,90624 TEST= Review URL: http://codereview.chromium.org/7501007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/connection_to_host.cc')
-rw-r--r--remoting/protocol/connection_to_host.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/remoting/protocol/connection_to_host.cc b/remoting/protocol/connection_to_host.cc
index b82143b..3841fc7 100644
--- a/remoting/protocol/connection_to_host.cc
+++ b/remoting/protocol/connection_to_host.cc
@@ -127,6 +127,9 @@ void ConnectionToHost::InitSession() {
session_.reset(session_manager_->Connect(
host_jid_, host_public_key_, client_token, candidate_config,
NewCallback(this, &ConnectionToHost::OnSessionStateChange)));
+
+ // Set the shared-secret for securing SSL channels.
+ session_->set_shared_secret(access_code_);
}
const SessionConfig* ConnectionToHost::config() {