diff options
author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 22:03:26 +0000 |
---|---|---|
committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-25 22:03:26 +0000 |
commit | 3f3b9b18150a554f25266ea128c00e7099b44dab (patch) | |
tree | 0a09cff50617d47ee2c331f1f9b1eeb230548b10 /chromeos/cert_loader.h | |
parent | e5d506af10531be07634ff375e0aea4bd975dbce (diff) | |
download | chromium_src-3f3b9b18150a554f25266ea128c00e7099b44dab.zip chromium_src-3f3b9b18150a554f25266ea128c00e7099b44dab.tar.gz chromium_src-3f3b9b18150a554f25266ea128c00e7099b44dab.tar.bz2 |
crypto/nss_util: Get TPM slot id, do lookup by id instead of by name.
chromeos/cert_loader: store slot id as int.
BUG=302124
Review URL: https://codereview.chromium.org/36593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231126 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos/cert_loader.h')
-rw-r--r-- | chromeos/cert_loader.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromeos/cert_loader.h b/chromeos/cert_loader.h index f9c2de0..226bf30 100644 --- a/chromeos/cert_loader.h +++ b/chromeos/cert_loader.h @@ -100,7 +100,7 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer, // 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_id() const { return tpm_token_slot_id_; } const std::string& tpm_user_pin() const { return tpm_user_pin_; } // This will be empty until certificates_loaded() is true. @@ -124,7 +124,7 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer, void OnPkcs11GetTpmTokenInfo(DBusMethodCallStatus call_status, const std::string& token_name, const std::string& user_pin, - int token_slot); + int token_slot_id); void OnTPMTokenInitialized(bool success); // These calls handle the updating of the certificate list after the TPM token @@ -178,7 +178,7 @@ class CHROMEOS_EXPORT CertLoader : public net::CertDatabase::Observer, // Cached TPM token info. std::string tpm_token_name_; - std::string tpm_token_slot_; + int tpm_token_slot_id_; std::string tpm_user_pin_; // Cached Certificates. |