Implement RSAPrivateKey::Copy()

remoting/protocol/v1_authenticator.cc

 // Copyright (c) 2011 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/v1_authenticator.h"
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "crypto/rsa_private_key.h"
 #include "remoting/base/constants.h"
@@ skipping 69 matching lines @@
 }
 
 ChannelAuthenticator*
 V1ClientAuthenticator::CreateChannelAuthenticator() const {
   DCHECK_EQ(state_, ACCEPTED);
   return new V1ClientChannelAuthenticator(remote_cert_, shared_secret_);
 };
 
 V1HostAuthenticator::V1HostAuthenticator(
     const std::string& local_cert,
-    crypto::RSAPrivateKey* local_private_key,
+    const crypto::RSAPrivateKey* local_private_key,
     const std::string& shared_secret,
     const std::string& remote_jid)
     : local_cert_(local_cert),
-      local_private_key_(local_private_key),
+      local_private_key_(local_private_key->Copy()),
       shared_secret_(shared_secret),
       remote_jid_(remote_jid),
       state_(WAITING_MESSAGE) {
 }
 
 V1HostAuthenticator::~V1HostAuthenticator() {
 }
 
 Authenticator::State V1HostAuthenticator::state() const {
   return state_;
@@ skipping 29 matching lines @@
   message->AddElement(certificate_tag);
 
   state_ = ACCEPTED;
   return message;
 }
 
 ChannelAuthenticator*
 V1HostAuthenticator::CreateChannelAuthenticator() const {
   DCHECK_EQ(state_, ACCEPTED);
   return new V1HostChannelAuthenticator(
-      local_cert_, local_private_key_, shared_secret_);
+      local_cert_, local_private_key_.get(), shared_secret_);
 };
 
 V1HostAuthenticatorFactory::V1HostAuthenticatorFactory(
     const std::string& local_cert,
-    crypto::RSAPrivateKey* local_private_key,
+    const crypto::RSAPrivateKey* local_private_key,
     const std::string& shared_secret)
     : local_cert_(local_cert),
+      local_private_key_(local_private_key->Copy()),
       shared_secret_(shared_secret) {
-  DCHECK(local_private_key);
-
-  // TODO(hclam): Need a better way to clone a key. See crbug.com/105220 .
-  std::vector<uint8> key_bytes;
-  CHECK(local_private_key->ExportPrivateKey(&key_bytes));
-  local_private_key_.reset(
-      crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_bytes));
   CHECK(local_private_key_.get());
 }
 
 V1HostAuthenticatorFactory::~V1HostAuthenticatorFactory() {
 }
 
 Authenticator* V1HostAuthenticatorFactory::CreateAuthenticator(
     const std::string& remote_jid,
     const buzz::XmlElement* first_message) {
   return new V1HostAuthenticator(local_cert_, local_private_key_.get(),
                                  shared_secret_, remote_jid);
 }
 
 }  // namespace remoting
 }  // namespace protocol