diff options
| author | rmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-03 10:49:44 +0000 |
|---|---|---|
| committer | rmsousa@chromium.org <rmsousa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-03 10:49:44 +0000 |
| commit | 76cfd03fe27318c71804459bf703f7781c3669ef (patch) | |
| tree | 517844eeb2aec851d093cb9a5ec7f40818b0a5cc /remoting/client | |
| parent | 02fe50b17be97cc048822a185742eb4655da72cd (diff) | |
| download | chromium_src-76cfd03fe27318c71804459bf703f7781c3669ef.zip chromium_src-76cfd03fe27318c71804459bf703f7781c3669ef.tar.gz chromium_src-76cfd03fe27318c71804459bf703f7781c3669ef.tar.bz2 | |
Separate Client and Host side of NegotiatingAuthenticator, and make the protocol stricter:
* Client sends a first message with supported methods (and optionally the first message for a method*).
* Host picks a method among those, and sends the first message (or reply).
* Client and host are now required to keep using the method selected by the host.
Now only the client has the possibility of creating more than one authenticator for the same negotiation (although it's not used now), and, even then, these are two necessarily different authenticators, so there's no chance of NegotiatingAuthenticator having to create the same type of authenticator twice.
* I'm keeping this because: (1) we did this before, up to M26, so we have to deal with this case anyway, and (2) it'll be useful for the pinless auth mechanism.
BUG=115899
Review URL: https://chromiumcodereview.appspot.com/13368002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192044 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client')
| -rw-r--r-- | remoting/client/chromoting_client.cc | 4 | ||||
| -rw-r--r-- | remoting/client/client_config.h | 2 | ||||
| -rw-r--r-- | remoting/client/plugin/chromoting_instance.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/remoting/client/chromoting_client.cc b/remoting/client/chromoting_client.cc index c83002f..f9febdc 100644 --- a/remoting/client/chromoting_client.cc +++ b/remoting/client/chromoting_client.cc @@ -14,7 +14,7 @@ #include "remoting/proto/video.pb.h" #include "remoting/protocol/authentication_method.h" #include "remoting/protocol/connection_to_host.h" -#include "remoting/protocol/negotiating_authenticator.h" +#include "remoting/protocol/negotiating_client_authenticator.h" #include "remoting/protocol/session_config.h" #include "remoting/protocol/transport.h" @@ -53,7 +53,7 @@ void ChromotingClient::Start( DCHECK(task_runner_->BelongsToCurrentThread()); scoped_ptr<protocol::Authenticator> authenticator( - protocol::NegotiatingAuthenticator::CreateForClient( + new protocol::NegotiatingClientAuthenticator( config_.authentication_tag, config_.fetch_secret_callback, config_.authentication_methods)); diff --git a/remoting/client/client_config.h b/remoting/client/client_config.h index 8cc67b3..a7e87e9 100644 --- a/remoting/client/client_config.h +++ b/remoting/client/client_config.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "remoting/protocol/authentication_method.h" -#include "remoting/protocol/negotiating_authenticator.h" +#include "remoting/protocol/negotiating_client_authenticator.h" namespace remoting { diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h index e814eaf..a57275a 100644 --- a/remoting/client/plugin/chromoting_instance.h +++ b/remoting/client/plugin/chromoting_instance.h @@ -39,7 +39,7 @@ #include "remoting/protocol/cursor_shape_stub.h" #include "remoting/protocol/input_event_tracker.h" #include "remoting/protocol/mouse_input_filter.h" -#include "remoting/protocol/negotiating_authenticator.h" +#include "remoting/protocol/negotiating_client_authenticator.h" namespace base { class DictionaryValue; |