Use FindNSSKeyFromPublicKeyInfoInSlot in GetPrivateKeyOnWorkerThread.

chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.cc

 // Copyright 2014 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 "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h"
 
 #include <cryptohi.h>
 #include <keyhi.h>
 
 #include "base/base64.h"
@@ skipping 38 matching lines @@
   base::Callback<void(crypto::ScopedPK11Slot)> callback_on_origin_thread =
       base::Bind(&RunCallbackOnThreadRunner, response_task_runner, callback);
 
   crypto::ScopedPK11Slot system_slot =
       crypto::GetSystemNSSKeySlot(callback_on_origin_thread);
   if (system_slot)
     callback_on_origin_thread.Run(system_slot.Pass());
 }
 
 // Checks if a private RSA key associated with |public_key| can be found in
-// |slot|.
+// |slot|. |slot| must be non-null.
 // Must be called on a worker thread.
 crypto::ScopedSECKEYPrivateKey GetPrivateKeyOnWorkerThread(
     PK11SlotInfo* slot,
     const std::string& public_key) {
+  DCHECK(slot);

[xiyuan, 2015/05/12 18:03:55]

nit: This code only runs on real device. So let's CHECK.

[davidben, 2015/05/12 18:05:28]

Done. (It's redundant with CHECKs further up the call chain, but having the
check locally is a good plan.)

   const uint8* public_key_uint8 =
       reinterpret_cast<const uint8*>(public_key.data());
   std::vector<uint8> public_key_vector(
       public_key_uint8, public_key_uint8 + public_key.size());
 
-  // TODO(davidben): This should be equivalent to calling
-  // FindNSSKeyFromPublicKeyInfoInSlot.
   crypto::ScopedSECKEYPrivateKey rsa_key(
-      crypto::FindNSSKeyFromPublicKeyInfo(public_key_vector));
-  if (!rsa_key || rsa_key->pkcs11Slot != slot ||
-      SECKEY_GetPrivateKeyType(rsa_key.get()) != rsaKey) {
+      crypto::FindNSSKeyFromPublicKeyInfoInSlot(public_key_vector, slot));
+  if (!rsa_key || SECKEY_GetPrivateKeyType(rsa_key.get()) != rsaKey)
     return nullptr;
-  }
   return rsa_key.Pass();
 }
 
 // Signs |data| using a private key associated with |public_key| and stored in
 // |slot|. Once the data is signed, callback is run on |response_task_runner|.
 // In case of an error, the callback will be passed an empty string.
 void SignDataOnWorkerThread(
     crypto::ScopedPK11Slot slot,
     const std::string& public_key,
     const std::string& data,
@@ skipping 265 matching lines @@
   // If key creation failed, reset the state machine.
   create_tpm_key_state_ =
       public_key.empty() ? CREATE_TPM_KEY_NOT_STARTED : CREATE_TPM_KEY_DONE;
 }
 
 void EasyUnlockTpmKeyManager::OnDataSigned(
     const base::Callback<void(const std::string&)>& callback,
     const std::string& signature) {
   callback.Run(signature);
 }