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

crypto/symmetric_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/symmetric_key.h"
 
 #include <nss.h>
 #include <pk11pub.h>
 
 #include "base/logging.h"
 #include "crypto/nss_util.h"
 
 namespace crypto {
 
 SymmetricKey::~SymmetricKey() {}
 
 // static
 SymmetricKey* SymmetricKey::GenerateRandomKey(Algorithm algorithm,
                                               size_t key_size_in_bits) {
   DCHECK_EQ(AES, algorithm);
 
+  LOG(ERROR) << "HIIIIIIIIIIIIIIIIIIIIIIIIIII";
   EnsureNSSInit();
   if (key_size_in_bits == 0)
     return NULL;
 
   ScopedPK11Slot slot(PK11_GetInternalSlot());
   if (!slot.get())
     return NULL;
 
   PK11SymKey* sym_key = PK11_KeyGen(slot.get(), CKM_AES_KEY_GEN, NULL,
                                     key_size_in_bits / 8, NULL);
   if (!sym_key)
     return NULL;
 
   return new SymmetricKey(sym_key);
 }
 
 // static
 SymmetricKey* SymmetricKey::DeriveKeyFromPassword(Algorithm algorithm,
                                                   const std::string& password,
                                                   const std::string& salt,
                                                   size_t iterations,
                                                   size_t key_size_in_bits) {
+  LOG(ERROR) << "HIIIIIIIIIIIIIIIIIIIIIIIIIII";
   EnsureNSSInit();
   if (salt.empty() || iterations == 0 || key_size_in_bits == 0)
     return NULL;
 
   SECItem password_item;
   password_item.type = siBuffer;
   password_item.data = reinterpret_cast<unsigned char*>(
       const_cast<char *>(password.data()));
   password_item.len = password.size();
 
@@ skipping 22 matching lines @@
                                        PR_FALSE, NULL);
   if (!sym_key)
     return NULL;
 
   return new SymmetricKey(sym_key);
 }
 
 // static
 SymmetricKey* SymmetricKey::Import(Algorithm algorithm,
                                    const std::string& raw_key) {
+  LOG(ERROR) << "HIIIIIIIIIIIIIIIIIIIIIIIIIII";
   EnsureNSSInit();
   CK_MECHANISM_TYPE cipher =
       algorithm == AES ? CKM_AES_CBC : CKM_SHA_1_HMAC;
 
   SECItem key_item;
   key_item.type = siBuffer;
   key_item.data = reinterpret_cast<unsigned char*>(
       const_cast<char *>(raw_key.data()));
   key_item.len = raw_key.size();
 
@@ skipping 30 matching lines @@
 SymmetricKey* SymmetricKey::CreateFromKey(PK11SymKey* key) {
   return new SymmetricKey(key);
 }
 #endif
 
 SymmetricKey::SymmetricKey(PK11SymKey* key) : key_(key) {
   DCHECK(key);
 }
 
 }  // namespace crypto