Move HostKeyPair into protocol::KeyPair.

remoting/protocol/v2_authenticator.h

 // 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.
 
 #ifndef REMOTING_PROTOCOL_V2_AUTHENTICATOR_H_
 #define REMOTING_PROTOCOL_V2_AUTHENTICATOR_H_
 
 #include <string>
 #include <queue>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "crypto/p224_spake.h"
+#include "remoting/base/rsa_key_pair.h"

[Wez, 2013/03/06 00:43:25]

nit: Can you forward-declare RsaKeyPair?

[rmsousa, 2013/03/06 04:36:49]

Done.

 #include "remoting/protocol/authenticator.h"
 
-namespace crypto {
-class RSAPrivateKey;
-}  // namespace crypto
-
 namespace remoting {
 namespace protocol {
 
 class V2Authenticator : public Authenticator {
  public:
   static bool IsEkeMessage(const buzz::XmlElement* message);
 
   static scoped_ptr<Authenticator> CreateForClient(
       const std::string& shared_secret,
       State initial_state);
 
   static scoped_ptr<Authenticator> CreateForHost(
       const std::string& local_cert,
-      const crypto::RSAPrivateKey& local_private_key,
+      scoped_refptr<RsaKeyPair> key_pair,
       const std::string& shared_secret,
       State initial_state);
 
   virtual ~V2Authenticator();
 
   // Authenticator interface.
   virtual State state() const OVERRIDE;
   virtual RejectionReason rejection_reason() const OVERRIDE;
   virtual void ProcessMessage(const buzz::XmlElement* message) OVERRIDE;
   virtual scoped_ptr<buzz::XmlElement> GetNextMessage() OVERRIDE;
   virtual scoped_ptr<ChannelAuthenticator>
       CreateChannelAuthenticator() const OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(V2AuthenticatorTest, InvalidSecret);
 
   V2Authenticator(crypto::P224EncryptedKeyExchange::PeerType type,
                   const std::string& shared_secret,
                   State initial_state);
 
   bool is_host_side() const;
 
   // Used only for host authenticators.
   std::string local_cert_;
-  scoped_ptr<crypto::RSAPrivateKey> local_private_key_;
+  scoped_refptr<RsaKeyPair> local_key_pair_;
   bool certificate_sent_;
 
   // Used only for client authenticators.
   std::string remote_cert_;
 
   // Used for both host and client authenticators.
   crypto::P224EncryptedKeyExchange key_exchange_impl_;
   State state_;
   RejectionReason rejection_reason_;
   std::queue<std::string> pending_messages_;
   std::string auth_key_;
 
   DISALLOW_COPY_AND_ASSIGN(V2Authenticator);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_V2_AUTHENTICATOR_H_