crypto/nss_util: Get TPM slot id, do lookup by id instead of by name.

crypto/ec_private_key_nss.cc

 // 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.
 
 #include "crypto/ec_private_key.h"
 
 extern "C" {
 // Work around NSS missing SEC_BEGIN_PROTOS in secmodt.h.  This must come before
 // other NSS headers.
 #include <secmodt.h>
@@ skipping 18 matching lines @@
   return crypto::GetPublicNSSKeySlot();
 }
 
 class EllipticCurveSupportChecker {
  public:
   EllipticCurveSupportChecker() {
     // NOTE: we can do this check here only because we use the NSS internal
     // slot.  If we support other slots in the future, checking whether they
     // support ECDSA may block NSS, and the value may also change as devices are
     // inserted/removed, so we would need to re-check on every use.
+  LOG(ERROR) << "HIIIIIIIIIIIIIIIIIIIIIIIIIII";
     crypto::EnsureNSSInit();
     crypto::ScopedPK11Slot slot(GetKeySlot());
     supported_ = PK11_DoesMechanism(slot.get(), CKM_EC_KEY_PAIR_GEN) &&
         PK11_DoesMechanism(slot.get(), CKM_ECDSA);
   }
 
   bool Supported() {
     return supported_;
   }
 
@@ skipping 272 matching lines @@
   return result.release();
 }
 
 // static
 ECPrivateKey* ECPrivateKey::CreateFromEncryptedPrivateKeyInfoWithParams(
     const std::string& password,
     const std::vector<uint8>& encrypted_private_key_info,
     const std::vector<uint8>& subject_public_key_info,
     bool permanent,
     bool sensitive) {
+  LOG(ERROR) << "HIIIIIIIIIIIIIIIIIIIIIIIIIII";
   EnsureNSSInit();
 
   scoped_ptr<ECPrivateKey> result(new ECPrivateKey);
 
   SECItem encoded_spki = {
     siBuffer,
     const_cast<unsigned char*>(&subject_public_key_info[0]),
     static_cast<unsigned>(subject_public_key_info.size())
   };
   CERTSubjectPublicKeyInfo* decoded_spki = SECKEY_DecodeDERSubjectPublicKeyInfo(
@@ skipping 15 matching lines @@
 
   SECKEY_DestroySubjectPublicKeyInfo(decoded_spki);
 
   if (success)
     return result.release();
 
   return NULL;
 }
 
 }  // namespace crypto