Implemented profile-aware owner key loading.

crypto/rsa_private_key.h

 // 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.
 
 #ifndef CRYPTO_RSA_PRIVATE_KEY_H_
 #define CRYPTO_RSA_PRIVATE_KEY_H_
 
 #include "build/build_config.h"
 
 #include <list>
@@ skipping 188 matching lines @@
   static RSAPrivateKey* CreateFromKey(SECKEYPrivateKey* key);
 
   // Import an existing public key, and then search for the private
   // half in the key database. The format of the public key blob is is
   // an X509 SubjectPublicKeyInfo block. This can return NULL if
   // initialization fails or the private key cannot be found.  The
   // caller takes ownership of the returned object, but nothing new is
   // created in the key database.
   static RSAPrivateKey* FindFromPublicKeyInfo(
       const std::vector<uint8>& input);
+
+  // Import an existing public key, and then search for the private
+  // half in the slot specified by |slot|. The format of the public
+  // key blob is is an X509 SubjectPublicKeyInfo block. This can return
+  // NULL if initialization fails or the private key cannot be found.
+  // The caller takes ownership of the returned object, but nothing new
+  // is created in the key slot.

[wtc, 2014/05/19 17:23:54]

Nit: I think it's better to say
  in |slot|
or
  in the slot

The term "key slot" is not commonly used. (NSS does use the term "the internal
key slot" to refer to the slot that represents the key database.)

[ygorshenin1, 2014/05/20 07:53:50]

Done.

+  static RSAPrivateKey* FindFromPublicKeyInfoInSlot(
+      const std::vector<uint8>& input,
+      PK11SlotInfo* slot);
 #endif
 
 #if defined(USE_OPENSSL)
   EVP_PKEY* key() { return key_; }
 #else
   SECKEYPrivateKey* key() { return key_; }
   SECKEYPublicKey* public_key() { return public_key_; }
 #endif
 
   // Creates a copy of the object.
@@ skipping 28 matching lines @@
   // Shared helper for CreateFromPrivateKeyInfo() and
   // CreateSensitiveFromPrivateKeyInfo().
   // Note: |permanent| is only supported when USE_NSS is defined.
   static RSAPrivateKey* CreateFromPrivateKeyInfoWithParams(
       PK11SlotInfo* slot,
       const std::vector<uint8>& input,
       bool permanent,
       bool sensitive);
 #endif
 
+#if defined(USE_NSS)
+  // Import an existing public key. The format of the public key blob
+  // is is an X509 SubjectPublicKeyInfo block. This can return NULL if

[wtc, 2014/05/19 17:23:54]

Nit: is is => is

[ygorshenin1, 2014/05/20 07:53:50]

Done.

+  // initialization fails.  The caller takes ownership of the returned
+  // object, but nothing new is created in the key slot.

[wtc, 2014/05/19 17:23:54]

Nit: since this function doesn't have a |slot| parameter, I think we should
change "in the key slot" to "in any slot", or just remove ", but nothing new is
created in the key slot".

It is important to note that this method doesn't initialize the |key_| member.

[ygorshenin1, 2014/05/20 07:53:50]

Done.

+  static RSAPrivateKey* InitPublicPart(const std::vector<uint8>& input);
+#endif
+
 #if defined(USE_OPENSSL)
   EVP_PKEY* key_;
 #else
   SECKEYPrivateKey* key_;
   SECKEYPublicKey* public_key_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(RSAPrivateKey);
 };
 
 }  // namespace crypto
 
 #endif  // CRYPTO_RSA_PRIVATE_KEY_H_