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

chromeos/cert_loader.h

 // Copyright (c) 2013 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 CHROMEOS_CERT_LOADER_H_
 #define CHROMEOS_CERT_LOADER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 82 matching lines @@
   bool CertificatesLoading() const;
 
   // Returns true if the TPM is available for hardware-backed certificates.
   bool IsHardwareBacked() const;
 
   bool certificates_loaded() const { return certificates_loaded_; }
 
   // TPM info is only valid once the TPM is available (IsHardwareBacked is
   // true). Otherwise empty strings will be returned.
   const std::string& tpm_token_name() const { return tpm_token_name_; }
-  const std::string& tpm_token_slot() const { return tpm_token_slot_; }
+  int tpm_token_slot() const { return tpm_token_slot_; }

[wtc, 2013/10/25 18:06:27]

Can we use unsigned long?

I suggest renaming the member and its getter "tpm_token_slot_id*" to make it
clear it is an integer ID now.

[mattm, 2013/10/25 18:41:37]

I just asked Darren about this.  I'll file a bug for it unless he has some
reason not to.
Done.

   const std::string& tpm_user_pin() const { return tpm_user_pin_; }
 
   // This will be empty until certificates_loaded() is true.
   const net::CertificateList& cert_list() const { return cert_list_; }
 
  private:
   CertLoader();
   virtual ~CertLoader();
 
   void MaybeRequestCertificates();
@@ skipping 57 matching lines @@
     TPM_TOKEN_INITIALIZED,
   };
   TPMTokenState tpm_token_state_;
 
   // The current request delay before the next attempt to initialize the
   // TPM. Will be adapted after each attempt.
   base::TimeDelta tpm_request_delay_;
 
   // Cached TPM token info.
   std::string tpm_token_name_;
-  std::string tpm_token_slot_;
+  int tpm_token_slot_;
   std::string tpm_user_pin_;
 
   // Cached Certificates.
   net::CertificateList cert_list_;
 
   base::ThreadChecker thread_checker_;
 
   // TaskRunner for crypto calls.
   scoped_refptr<base::SequencedTaskRunner> crypto_task_runner_;
 
   // TaskRunner for other slow tasks. May be set in tests.
   scoped_refptr<base::TaskRunner> slow_task_runner_for_test_;
 
   // This factory should be used only for callbacks during TPMToken
   // initialization.
   base::WeakPtrFactory<CertLoader> initialize_token_factory_;
 
   // This factory should be used only for callbacks during updating the
   // certificate list.
   base::WeakPtrFactory<CertLoader> update_certificates_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CertLoader);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_CERT_LOADER_H_