Implement RSAPrivateKey::Copy()

BUG=105220

Review URL: http://codereview.chromium.org/8727014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112837 0039d316-1c4b-4281-b951-d872f2087c98

crypto/rsa_private_key.h

@@ -223,11 +223,14 @@ class CRYPTO_EXPORT RSAPrivateKey {
   CSSM_KEY_PTR public_key() { return &public_key_; }
 #endif
 
+  // Creates a copy of the object.
+  RSAPrivateKey* Copy() const;
+
   // Exports the private key to a PKCS #1 PrivateKey block.
-  bool ExportPrivateKey(std::vector<uint8>* output);
+  bool ExportPrivateKey(std::vector<uint8>* output) const;
 
   // Exports the public key to an X509 SubjectPublicKeyInfo block.
-  bool ExportPublicKey(std::vector<uint8>* output);
+  bool ExportPublicKey(std::vector<uint8>* output) const;
 
  private:
 #if defined(USE_NSS)

crypto/rsa_private_key_mac.cc

@@ -174,17 +174,24 @@ RSAPrivateKey::~RSAPrivateKey() {
   }
 }
 
-bool RSAPrivateKey::ExportPrivateKey(std::vector<uint8>* output) {
+RSAPrivateKey* RSAPrivateKey::Copy() const {
+  std::vector<uint8> key_bytes;
+  if (!ExportPrivateKey(&key_bytes))
+    return NULL;
+  return CreateFromPrivateKeyInfo(key_bytes);
+}
+
+bool RSAPrivateKey::ExportPrivateKey(std::vector<uint8>* output) const {
   if (!key_.KeyData.Data || !key_.KeyData.Length) {
     return false;
   }
   output->clear();
   output->insert(output->end(), key_.KeyData.Data,
-                key_.KeyData.Data + key_.KeyData.Length);
+                 key_.KeyData.Data + key_.KeyData.Length);
   return true;
 }
 
-bool RSAPrivateKey::ExportPublicKey(std::vector<uint8>* output) {
+bool RSAPrivateKey::ExportPublicKey(std::vector<uint8>* output) const {
   PrivateKeyInfoCodec private_key_info(true);
   std::vector<uint8> private_key_data;
   private_key_data.assign(key_.KeyData.Data,

crypto/rsa_private_key_nss.cc

@@ -138,8 +138,14 @@ RSAPrivateKey* RSAPrivateKey::FindFromPublicKeyInfo(
   return NULL;
 }
 
+RSAPrivateKey* RSAPrivateKey::Copy() const {
+  RSAPrivateKey* copy = new RSAPrivateKey();
+  copy->key_ = SECKEY_CopyPrivateKey(key_);
+  copy->public_key_ = SECKEY_CopyPublicKey(public_key_);
+  return copy;
+}
 
-bool RSAPrivateKey::ExportPrivateKey(std::vector<uint8>* output) {
+bool RSAPrivateKey::ExportPrivateKey(std::vector<uint8>* output) const {
   PrivateKeyInfoCodec private_key_info(true);
 
   // Manually read the component attributes of the private key and build up
@@ -161,7 +167,7 @@ bool RSAPrivateKey::ExportPrivateKey(std::vector<uint8>* output) {
   return private_key_info.Export(output);
 }
 
-bool RSAPrivateKey::ExportPublicKey(std::vector<uint8>* output) {
+bool RSAPrivateKey::ExportPublicKey(std::vector<uint8>* output) const {
   ScopedSECItem der_pubkey(SECKEY_EncodeDERSubjectPublicKeyInfo(public_key_));
   if (!der_pubkey.get()) {
     NOTREACHED();

crypto/rsa_private_key_openssl.cc

@@ -124,11 +124,22 @@ RSAPrivateKey::~RSAPrivateKey() {
     EVP_PKEY_free(key_);
 }
 
-bool RSAPrivateKey::ExportPrivateKey(std::vector<uint8>* output) {
+RSAPrivateKey* RSAPrivateKey::Copy() const {
+  scoped_ptr<RSAPrivateKey> copy(new RSAPrivateKey());
+  RSA* rsa = EVP_PKEY_get1_RSA(key_);
+  if (!rsa)
+    return NULL;
+  copy->key_ = EVP_PKEY_new();
+  if (!EVP_PKEY_set1_RSA(copy->key_, rsa))
+    return NULL;
+  return copy.release();
+}
+
+bool RSAPrivateKey::ExportPrivateKey(std::vector<uint8>* output) const {
   return ExportKey(key_, i2d_PKCS8PrivateKeyInfo_bio, output);
 }
 
-bool RSAPrivateKey::ExportPublicKey(std::vector<uint8>* output) {
+bool RSAPrivateKey::ExportPublicKey(std::vector<uint8>* output) const {
   return ExportKey(key_, i2d_PUBKEY_bio, output);
 }
 

crypto/rsa_private_key_win.cc

@@ -134,7 +134,19 @@ bool RSAPrivateKey::InitProvider() {
                                       PROV_RSA_FULL, CRYPT_VERIFYCONTEXT);
 }
 
-bool RSAPrivateKey::ExportPrivateKey(std::vector<uint8>* output) {
+RSAPrivateKey* RSAPrivateKey::Copy() const {
+  scoped_ptr<RSAPrivateKey> copy(new RSAPrivateKey());
+  if (!CryptContextAddRef(provider_, NULL, 0)) {
+    NOTREACHED();
+    return NULL;
+  }
+  copy->provider_.reset(provider_.get());
+  if (!CryptDuplicateKey(key_.get(), NULL, 0, copy->key_.receive()))
+    return NULL;
+  return copy.release();
+}
+
+bool RSAPrivateKey::ExportPrivateKey(std::vector<uint8>* output) const {
   // Export the key
   DWORD blob_length = 0;
   if (!CryptExportKey(key_, 0, PRIVATEKEYBLOB, 0, NULL, &blob_length)) {
@@ -187,7 +199,7 @@ bool RSAPrivateKey::ExportPrivateKey(std::vector<uint8>* output) {
   return pki.Export(output);
 }
 
-bool RSAPrivateKey::ExportPublicKey(std::vector<uint8>* output) {
+bool RSAPrivateKey::ExportPublicKey(std::vector<uint8>* output) const {
   DWORD key_info_len;
   if (!CryptExportPublicKeyInfo(
       provider_, AT_SIGNATURE, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,

remoting/protocol/v1_authenticator.cc

@@ -87,11 +87,11 @@ V1ClientAuthenticator::CreateChannelAuthenticator() const {
 
 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) {
@@ -141,22 +141,16 @@ 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());
 }
 

remoting/protocol/v1_authenticator.h

@@ -42,7 +42,7 @@ class V1HostAuthenticator : public Authenticator {
  public:
   // Doesn't take ownership of |local_private_key|.
   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);
   virtual ~V1HostAuthenticator();
@@ -55,7 +55,7 @@ class V1HostAuthenticator : public Authenticator {
 
  private:
   std::string local_cert_;
-  crypto::RSAPrivateKey* local_private_key_;
+  scoped_ptr<crypto::RSAPrivateKey> local_private_key_;
   std::string shared_secret_;
   std::string remote_jid_;
   State state_;
@@ -67,7 +67,7 @@ class V1HostAuthenticatorFactory : public AuthenticatorFactory {
  public:
   // Doesn't take ownership of |local_private_key|.
   V1HostAuthenticatorFactory(const std::string& local_cert,
-                             crypto::RSAPrivateKey* local_private_key,
+                             const crypto::RSAPrivateKey* local_private_key,
                              const std::string& shared_secret);
   virtual ~V1HostAuthenticatorFactory();