diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-25 21:45:04 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-25 21:45:04 +0000 |
| commit | bee9b546274a20a8e51c7924e4af0b833b51a846 (patch) | |
| tree | 0cd4a78b4add69bc79760aabf1e79bfd2b8f9ca8 /crypto/nss_util.h | |
| parent | e703dfe0959014e0f5e2b3831723208614528164 (diff) | |
| download | chromium_src-bee9b546274a20a8e51c7924e4af0b833b51a846.zip chromium_src-bee9b546274a20a8e51c7924e4af0b833b51a846.tar.gz chromium_src-bee9b546274a20a8e51c7924e4af0b833b51a846.tar.bz2 | |
Remove crypto::GetTPMTokenInfo which is no longer necessary.
BUG=none
Review URL: https://codereview.chromium.org/83833003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237150 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/nss_util.h')
| -rw-r--r-- | crypto/nss_util.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/crypto/nss_util.h b/crypto/nss_util.h index 2c825a0..efc8140 100644 --- a/crypto/nss_util.h +++ b/crypto/nss_util.h @@ -102,12 +102,6 @@ CRYPTO_EXPORT void OpenPersistentNSSDB(); // GetPrivateNSSKeySlot() will return the TPM slot if one was found. CRYPTO_EXPORT void EnableTPMTokenForNSS(); -// Get name and user PIN for the built-in TPM token on ChromeOS. -// Either one can safely be NULL. Should only be called after -// EnableTPMTokenForNSS has been called with a non-null delegate. -CRYPTO_EXPORT void GetTPMTokenInfo(std::string* token_name, - std::string* user_pin); - // Returns true if the TPM is owned and PKCS#11 initialized with the // user and security officer PINs, and has been enabled in NSS by // calling EnableTPMForNSS, and Chaps has been successfully @@ -115,9 +109,7 @@ CRYPTO_EXPORT void GetTPMTokenInfo(std::string* token_name, CRYPTO_EXPORT bool IsTPMTokenReady(); // Initialize the TPM token. Does nothing if it is already initialized. -CRYPTO_EXPORT bool InitializeTPMToken(const std::string& token_name, - int token_slot_id, - const std::string& user_pin); +CRYPTO_EXPORT bool InitializeTPMToken(int token_slot_id); #endif // Convert a NSS PRTime value into a base::Time object. |