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

crypto/rsa_private_key_nss.cc

 // Copyright (c) 2011 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/rsa_private_key.h"
 
 #include <cryptohi.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 #include <secmod.h>
@@ skipping 81 matching lines @@
     NOTREACHED();
     delete copy;
     return NULL;
   }
   return copy;
 }
 
 // static
 RSAPrivateKey* RSAPrivateKey::FindFromPublicKeyInfo(
     const std::vector<uint8>& input) {
+  LOG(ERROR) << "HIIIIIIIIIIIIIIIIIIIIIIIIIII";
   EnsureNSSInit();
 
   scoped_ptr<RSAPrivateKey> result(new RSAPrivateKey);
 
   // First, decode and save the public key.
   SECItem key_der;
   key_der.type = siBuffer;
   key_der.data = const_cast<unsigned char*>(&input[0]);
   key_der.len = input.size();
 
@@ skipping 77 matching lines @@
   if (!der_pubkey.get()) {
     NOTREACHED();
     return false;
   }
 
   output->assign(der_pubkey->data, der_pubkey->data + der_pubkey->len);
   return true;
 }
 
 RSAPrivateKey::RSAPrivateKey() : key_(NULL), public_key_(NULL) {
+  LOG(ERROR) << "HIIIIIIIIIIIIIIIIIIIIIIIIIII";
   EnsureNSSInit();
 }
 
 // static
 RSAPrivateKey* RSAPrivateKey::CreateWithParams(uint16 num_bits,
                                                bool permanent,
                                                bool sensitive) {
 #if !defined(USE_NSS)
   if (permanent) {
     NOTIMPLEMENTED();
     return NULL;
   }
 #endif
 
+  LOG(ERROR) << "HIIIIIIIIIIIIIIIIIIIIIIIIIII";
   EnsureNSSInit();
 
   scoped_ptr<RSAPrivateKey> result(new RSAPrivateKey);
 
   ScopedPK11Slot slot(permanent ? GetPrivateNSSKeySlot() :
                       PK11_GetInternalSlot());
   if (!slot.get())
     return NULL;
 
   PK11RSAGenParams param;
@@ skipping 18 matching lines @@
 #if !defined(USE_NSS)
   if (permanent) {
     NOTIMPLEMENTED();
     return NULL;
   }
 #endif
 
   // This method currently leaks some memory.
   // See http://crbug.com/34742.
   ANNOTATE_SCOPED_MEMORY_LEAK;
+  LOG(ERROR) << "HIIIIIIIIIIIIIIIIIIIIIIIIIII";
   EnsureNSSInit();
 
   scoped_ptr<RSAPrivateKey> result(new RSAPrivateKey);
 
   ScopedPK11Slot slot(permanent ? GetPrivateNSSKeySlot() :
                       PK11_GetInternalSlot());
   if (!slot.get())
     return NULL;
 
   SECItem der_private_key_info;
@@ skipping 14 matching lines @@
   result->public_key_ = SECKEY_ConvertToPublicKey(result->key_);
   if (!result->public_key_) {
     NOTREACHED();
     return NULL;
   }
 
   return result.release();
 }
 
 }  // namespace crypto