Move HostKeyPair into protocol::KeyPair.

remoting/base/rsa_key_pair.cc

Index: remoting/base/rsa_key_pair.cc
diff --git a/remoting/host/host_key_pair.cc b/remoting/base/rsa_key_pair.cc
similarity index 62%
rename from remoting/host/host_key_pair.cc
rename to remoting/base/rsa_key_pair.cc
index ff0f2cfcb380d33a5f1aed33b6738ea778f01aac..a2cf932c2f2993960d7fcd3fb95726da449da05b 100644
--- a/remoting/host/host_key_pair.cc
+++ b/remoting/base/rsa_key_pair.cc
@@ -2,7 +2,7 @@
 // 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/base/rsa_key_pair.h"
 
 #include <limits>
 #include <string>
@@ -15,54 +15,46 @@
 #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 {
 
-HostKeyPair::HostKeyPair() { }
+RsaKeyPair::RsaKeyPair() { }

[Sergey Ulanov, 2013/03/06 20:51:34]

remove space between the braces please

[rmsousa, 2013/03/07 03:27:44]

Done.

 
-HostKeyPair::~HostKeyPair() { }
+RsaKeyPair::~RsaKeyPair() { }

[Sergey Ulanov, 2013/03/06 20:51:34]

remove space between the braces please

[rmsousa, 2013/03/07 03:27:44]

Done.

 
-void HostKeyPair::Generate() {
-  key_.reset(crypto::RSAPrivateKey::Create(2048));
+//static
+scoped_refptr<RsaKeyPair> RsaKeyPair::Generate() {
+  scoped_refptr<RsaKeyPair> result = new RsaKeyPair();
+  result->key_.reset(crypto::RSAPrivateKey::Create(2048));

[Sergey Ulanov, 2013/03/06 20:51:34]

Creation may fail in which case Create() will return NULL. In that case you want
to return null from this method.

[rmsousa, 2013/03/07 03:27:44]

Done.

+  return result;
 }
 
-bool HostKeyPair::LoadFromString(const std::string& key_base64) {
+//static
+scoped_refptr<RsaKeyPair> RsaKeyPair::FromString(
+    const std::string& key_base64) {
+  scoped_refptr<RsaKeyPair> result = new RsaKeyPair();
   std::string key_str;
   if (!base::Base64Decode(key_base64, &key_str)) {
     LOG(ERROR) << "Failed to decode private key.";
-    return false;
+    return NULL;
   }
 
   std::vector<uint8> key_buf(key_str.begin(), key_str.end());
-  key_.reset(crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_buf));
-  if (key_.get() == NULL) {
+  result->key_.reset(crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_buf));
+  if (result->key_.get() == NULL) {
     LOG(ERROR) << "Invalid private key.";
-    return false;
+    return NULL;
   }
 
-  return true;
+  return result;
 }
 
-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);
-}
-
-void HostKeyPair::Save(MutableHostConfig* host_config) {
-  host_config->SetString(kPrivateKeyConfigPath, GetAsString());
-}
-
-std::string HostKeyPair::GetAsString() const {
+std::string RsaKeyPair::ToString() const {
   // Check that the key initialized.
   DCHECK(key_.get() != NULL);
 
   std::vector<uint8> key_buf;
-  key_->ExportPrivateKey(&key_buf);
+  CHECK(key_->ExportPrivateKey(&key_buf));
   std::string key_str(key_buf.begin(), key_buf.end());
   std::string key_base64;
   if (!base::Base64Encode(key_str, &key_base64)) {
@@ -71,16 +63,16 @@ std::string HostKeyPair::GetAsString() const {
   return key_base64;
 }
 
-std::string HostKeyPair::GetPublicKey() const {
+std::string RsaKeyPair::GetPublicKey() const {
   std::vector<uint8> public_key;
-  key_->ExportPublicKey(&public_key);
+  CHECK(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 RsaKeyPair::SignMessage(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()),
@@ -93,13 +85,7 @@ std::string HostKeyPair::GetSignature(const std::string& message) const {
   return signature_base64;
 }
 
-crypto::RSAPrivateKey* HostKeyPair::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 RsaKeyPair::GenerateCertificate() const {
   scoped_refptr<net::X509Certificate> cert =
       net::X509Certificate::CreateSelfSigned(
           key_.get(), "CN=chromoting",