Move crypto files out of base, to a top level directory.
src/crypto is now an independent project that contains our
cryptographic primitives (except md5 and sha1).
This removes the base dependency from nss, openssl and sqlite.
BUG=76996
TEST=none
Review URL: http://codereview.chromium.org/6805019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81611 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/remoting/host/host_key_pair.cc b/remoting/host/host_key_pair.cc
index ad3d59b1..948b4adc 100644
--- a/remoting/host/host_key_pair.cc
+++ b/remoting/host/host_key_pair.cc
@@ -9,12 +9,12 @@
#include <vector>
#include "base/base64.h"
-#include "base/crypto/rsa_private_key.h"
-#include "base/crypto/signature_creator.h"
#include "base/logging.h"
#include "base/rand_util.h"
#include "base/task.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"
@@ -25,7 +25,7 @@
HostKeyPair::~HostKeyPair() { }
void HostKeyPair::Generate() {
- key_.reset(base::RSAPrivateKey::Create(2048));
+ key_.reset(crypto::RSAPrivateKey::Create(2048));
}
bool HostKeyPair::LoadFromString(const std::string& key_base64) {
@@ -36,7 +36,7 @@
}
std::vector<uint8> key_buf(key_str.begin(), key_str.end());
- key_.reset(base::RSAPrivateKey::CreateFromPrivateKeyInfo(key_buf));
+ key_.reset(crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_buf));
if (key_.get() == NULL) {
LOG(ERROR) << "Invalid private key.";
return false;
@@ -76,8 +76,8 @@
}
std::string HostKeyPair::GetSignature(const std::string& message) const {
- scoped_ptr<base::SignatureCreator> signature_creator(
- base::SignatureCreator::Create(key_.get()));
+ 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;
@@ -88,10 +88,10 @@
return signature_base64;
}
-base::RSAPrivateKey* HostKeyPair::CopyPrivateKey() const {
+crypto::RSAPrivateKey* HostKeyPair::CopyPrivateKey() const {
std::vector<uint8> key_bytes;
CHECK(key_->ExportPrivateKey(&key_bytes));
- return base::RSAPrivateKey::CreateFromPrivateKeyInfo(key_bytes);
+ return crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_bytes);
}
net::X509Certificate* HostKeyPair::GenerateCertificate() const {
