Enable Curve25519 in host and client for PIN-based and third-party auth.

remoting/protocol/negotiating_authenticator_base.cc

 // Copyright (c) 2012 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.
 
 #include "remoting/protocol/negotiating_authenticator_base.h"
 
 #include <algorithm>
 #include <sstream>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/strings/string_split.h"
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/protocol/channel_authenticator.h"
 #include "remoting/protocol/name_value_map.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
 
 namespace remoting {
 namespace protocol {
 
 namespace {
 
 const NameMapElement<NegotiatingAuthenticatorBase::Method>
     kAuthenticationMethodStrings[] = {
-        {NegotiatingAuthenticatorBase::Method::SPAKE2_SHARED_SECRET_PLAIN,
+        {NegotiatingAuthenticatorBase::Method::SHARED_SECRET_PLAIN_SPAKE2_P224,
          "spake2_plain"},
-        {NegotiatingAuthenticatorBase::Method::SPAKE2_SHARED_SECRET_HMAC,
+
+        {NegotiatingAuthenticatorBase::Method::SHARED_SECRET_SPAKE2_P224,
          "spake2_hmac"},
-        {NegotiatingAuthenticatorBase::Method::SPAKE2_PAIR, "spake2_pair"},
-        {NegotiatingAuthenticatorBase::Method::THIRD_PARTY, "third_party"},
+        {NegotiatingAuthenticatorBase::Method::SHARED_SECRET_SPAKE2_CURVE25519,
+         "spake2_curve25519"},
+
+        {NegotiatingAuthenticatorBase::Method::PAIRED_SPAKE2_P224,
+         "spake2_pair"},
+
+        {NegotiatingAuthenticatorBase::Method::THIRD_PARTY_SPAKE2_P224,
+         "third_party"},
+        {NegotiatingAuthenticatorBase::Method::THIRD_PARTY_SPAKE2_CURVE25519,
+         "third_party_spake2_curve25519"},
 };
 
 }  // namespace
 
 const buzz::StaticQName NegotiatingAuthenticatorBase::kMethodAttributeQName =
     { "", "method" };
 const buzz::StaticQName
 NegotiatingAuthenticatorBase::kSupportedMethodsAttributeQName =
     { "", "supported-methods" };
 const char NegotiatingAuthenticatorBase::kSupportedMethodsSeparator = ',';
@@ skipping 90 matching lines @@
 }
 
 scoped_ptr<ChannelAuthenticator>
 NegotiatingAuthenticatorBase::CreateChannelAuthenticator() const {
   DCHECK_EQ(state(), ACCEPTED);
   return current_authenticator_->CreateChannelAuthenticator();
 }
 
 }  // namespace protocol
 }  // namespace remoting