Move HostKeyPair into protocol::KeyPair.

remoting/protocol/me2me_host_authenticator_factory.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/me2me_host_authenticator_factory.h"
 
 #include "base/base64.h"
 #include "base/string_util.h"
-#include "crypto/rsa_private_key.h"
 #include "remoting/protocol/channel_authenticator.h"
+#include "remoting/protocol/key_pair.h"
 #include "remoting/protocol/negotiating_authenticator.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
 namespace remoting {
 namespace protocol {
 
 namespace {
 
 // Authenticator that accepts one message and rejects connection after that.
 class RejectingAuthenticator : public Authenticator {
@@ skipping 30 matching lines @@
   }
 
  protected:
   State state_;
 };
 
 }  // namespace
 
 Me2MeHostAuthenticatorFactory::Me2MeHostAuthenticatorFactory(
     const std::string& local_cert,
-    const crypto::RSAPrivateKey& local_private_key,
+    scoped_ptr<KeyPair> key_pair,
     const SharedSecretHash& shared_secret_hash)
     : local_cert_(local_cert),
-      local_private_key_(local_private_key.Copy()),
+      key_pair_(key_pair.Pass()),
       shared_secret_hash_(shared_secret_hash) {
 }
 
 Me2MeHostAuthenticatorFactory::~Me2MeHostAuthenticatorFactory() {
 }
 
 scoped_ptr<Authenticator> Me2MeHostAuthenticatorFactory::CreateAuthenticator(
     const std::string& local_jid,
     const std::string& remote_jid,
     const buzz::XmlElement* first_message) {
 
   size_t slash_pos = local_jid.find('/');
   if (slash_pos == std::string::npos) {
     LOG(DFATAL) << "Invalid local JID:" << local_jid;
     return scoped_ptr<Authenticator>(new RejectingAuthenticator());
   }
 
   // Verify that the client's jid is an ASCII string, and then check
   // that the client has the same bare jid as the host, i.e. client's
   // full JID starts with host's bare jid. Comparison is case
   // insensitive.
   if (!IsStringASCII(remote_jid) ||
       !StartsWithASCII(remote_jid, local_jid.substr(0, slash_pos + 1), false)) {
     LOG(ERROR) << "Rejecting incoming connection from " << remote_jid;
     return scoped_ptr<Authenticator>(new RejectingAuthenticator());
   }
 
   return NegotiatingAuthenticator::CreateForHost(
-      local_cert_, *local_private_key_, shared_secret_hash_.value,
+      local_cert_, key_pair_->Copy(), shared_secret_hash_.value,
       shared_secret_hash_.hash_function);
 }
 
 }  // namespace protocol
 }  // namespace remoting