Begin adding mutual authentication into the SessionManager::connect() call.

This CL mainly changes APIs and stubs out functionality needed to
actually create the correct auth token stanzas.

BUG=None
TEST=compiles.

Review URL: http://codereview.chromium.org/4941001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67316 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 26 insertions, 2 deletions

diff --git a/remoting/proto/auth.proto b/remoting/proto/auth.proto
new file mode 100644
index 0000000..f3a555e
--- /dev/null
+++ b/remoting/proto/auth.proto
@@ -0,0 +1,21 @@
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Messages related to Client/Host Mutual Authentication and Local Login.
+
+syntax = "proto2";
+
+option optimize_for = LITE_RUNTIME;
+
+package remoting.protocol;
+
+// Represents the data used in generating the client auth token during session
+// initiation.
+message ClientAuthToken {
+  optional string host_full_jid = 1;
+  optional string client_full_jid = 2;
+
+  // A short-lived OAuth token identifying the client to the host.
+  optional string client_oauth_token = 3;
+}
diff --git a/remoting/proto/chromotocol.gyp b/remoting/proto/chromotocol.gyp
index faab3e7..705af2d 100644
--- a/remoting/proto/chromotocol.gyp
+++ b/remoting/proto/chromotocol.gyp
@@ -13,6 +13,7 @@
       'target_name': 'chromotocol_proto',
       'type': 'none',
       'sources': [
+        'auth.proto',
         'control.proto',
         'event.proto',
         'internal.proto',
@@ -66,6 +67,8 @@
       # chromotocol_proto to compile.
       'hard_dependency': 1,
       'sources': [
+        '<(out_dir)/auth.pb.cc',
+        '<(out_dir)/auth.pb.h',
         '<(out_dir)/control.pb.cc',
         '<(out_dir)/control.pb.h',
         '<(out_dir)/event.pb.cc',
diff --git a/remoting/proto/internal.proto b/remoting/proto/internal.proto
index 7a8e908..a22ab632 100644
--- a/remoting/proto/internal.proto
+++ b/remoting/proto/internal.proto
@@ -2,7 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Internal messages as a unit for transmission in the wire.
+// Internal message types that should not be seen outside the protocol
+// directory.
 
 syntax = "proto2";
 
@@ -16,7 +17,6 @@ package remoting;
 
 // Defines the message that is sent from the client to the host.
 // Only one of the optional messages should be present.
-// NEXT ID: 7
 message ChromotingClientMessage {
   optional KeyEvent key_event = 1;
   optional MouseSetPositionEvent mouse_set_position_event = 2;