Move HostKeyPair into protocol::KeyPair.

remoting/protocol/key_pair.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/host/host_key_pair.h"
+#include "remoting/protocol/key_pair.h"
 
 #include <limits>
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/logging.h"
 #include "base/rand_util.h"
 #include "base/time.h"
 #include "crypto/rsa_private_key.h"
 #include "crypto/signature_creator.h"
 #include "net/base/x509_certificate.h"
-#include "remoting/host/host_config.h"
 
 namespace remoting {
+namespace protocol {
 
-HostKeyPair::HostKeyPair() { }
+KeyPair::KeyPair() { }
 
-HostKeyPair::~HostKeyPair() { }
+KeyPair::~KeyPair() { }
 
-void HostKeyPair::Generate() {
+void KeyPair::Generate() {
   key_.reset(crypto::RSAPrivateKey::Create(2048));
 }
 
-bool HostKeyPair::LoadFromString(const std::string& key_base64) {
+bool KeyPair::LoadFromString(const std::string& key_base64) {
   std::string key_str;
   if (!base::Base64Decode(key_base64, &key_str)) {
     LOG(ERROR) << "Failed to decode private key.";
     return false;
   }
 
   std::vector<uint8> key_buf(key_str.begin(), key_str.end());
   key_.reset(crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_buf));
   if (key_.get() == NULL) {
     LOG(ERROR) << "Invalid private key.";
     return false;
   }
 
   return true;
 }
 
-bool HostKeyPair::Load(const HostConfig& host_config) {
-  std::string key_base64;
-  if (!host_config.GetString(kPrivateKeyConfigPath, &key_base64)) {
-    LOG(ERROR) << "Private key wasn't found in the config file.";
-    return false;
-  }
-  return LoadFromString(key_base64);
+scoped_ptr<KeyPair> KeyPair::Copy() {
+  scoped_ptr<KeyPair> pair(new KeyPair());
+  pair->LoadFromString(this->GetAsString());

[Wez, 2013/02/23 03:43:20]

Doesn't RSAPrivateKey have a Copy() method now?

[rmsousa, 2013/02/26 02:38:52]

Done.

+  return pair.Pass();
 }
 
-void HostKeyPair::Save(MutableHostConfig* host_config) {
-  host_config->SetString(kPrivateKeyConfigPath, GetAsString());
-}
-
-std::string HostKeyPair::GetAsString() const {
+std::string KeyPair::GetAsString() const {
   // Check that the key initialized.
   DCHECK(key_.get() != NULL);
 
   std::vector<uint8> key_buf;
   key_->ExportPrivateKey(&key_buf);

[Wez, 2013/02/23 03:43:20]

IIRC, the reason we didn't provide Copy() before was that ExportPrivateKey() may
fail if the implementation of _key_| is TPM-backed - we should at least CHECK
this call (see CopyPrivateKey()).

[rmsousa, 2013/02/26 02:38:52]

Done.

   std::string key_str(key_buf.begin(), key_buf.end());
   std::string key_base64;
   if (!base::Base64Encode(key_str, &key_base64)) {
     LOG(FATAL) << "Base64Encode failed";
   }
   return key_base64;
 }
 
-std::string HostKeyPair::GetPublicKey() const {
+std::string KeyPair::GetPublicKey() const {
   std::vector<uint8> public_key;
   key_->ExportPublicKey(&public_key);
   std::string public_key_str(public_key.begin(), public_key.end());
   std::string public_key_base64;
   base::Base64Encode(public_key_str, &public_key_base64);
   return public_key_base64;
 }
 
-std::string HostKeyPair::GetSignature(const std::string& message) const {
+std::string KeyPair::GetSignature(const std::string& message) const {
   scoped_ptr<crypto::SignatureCreator> signature_creator(
       crypto::SignatureCreator::Create(key_.get()));
   signature_creator->Update(reinterpret_cast<const uint8*>(message.c_str()),
                             message.length());
   std::vector<uint8> signature_buf;
   signature_creator->Final(&signature_buf);
   std::string signature_str(signature_buf.begin(), signature_buf.end());
   std::string signature_base64;
   base::Base64Encode(signature_str, &signature_base64);
   return signature_base64;
 }
 
-crypto::RSAPrivateKey* HostKeyPair::CopyPrivateKey() const {
+crypto::RSAPrivateKey* KeyPair::CopyPrivateKey() const {
   std::vector<uint8> key_bytes;
   CHECK(key_->ExportPrivateKey(&key_bytes));
   return crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_bytes);
 }
 
-std::string HostKeyPair::GenerateCertificate() const {
+std::string KeyPair::GenerateCertificate() const {
   scoped_refptr<net::X509Certificate> cert =
       net::X509Certificate::CreateSelfSigned(
           key_.get(), "CN=chromoting",
           base::RandInt(1, std::numeric_limits<int>::max()),
           base::TimeDelta::FromDays(1));
   if (!cert)
     return std::string();
 
   std::string encoded;
   bool result = net::X509Certificate::GetDEREncoded(cert->os_cert_handle(),
                                                     &encoded);
   CHECK(result);
   return encoded;
 }
 
+}  // namespace protocol
 }  // namespace remoting