diff options
author | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 18:49:54 +0000 |
---|---|---|
committer | gspencer@chromium.org <gspencer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-19 18:49:54 +0000 |
commit | c64b9143b18ce8ec3746c1288c7c1204e8ce6612 (patch) | |
tree | ffb0482fb7be708006274e1a3e3d0a29e7030b13 /crypto/rsa_private_key_nss.cc | |
parent | 18a8ff16490804f05c5f3d939e863c3b09749ede (diff) | |
download | chromium_src-c64b9143b18ce8ec3746c1288c7c1204e8ce6612.zip chromium_src-c64b9143b18ce8ec3746c1288c7c1204e8ce6612.tar.gz chromium_src-c64b9143b18ce8ec3746c1288c7c1204e8ce6612.tar.bz2 |
This adds calls to new API for cryptohomed that gives status
of the PKCS#11 initialization of the TPM.
Also, add cros_library wrapper calls for new libcros API.
BUG=chromium-os:12303
TEST=Ran on device, checked to make sure TPM certs showed up,
indicating that status and user PIN were successfully retrieved.
Review URL: http://codereview.chromium.org/6838032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/rsa_private_key_nss.cc')
-rw-r--r-- | crypto/rsa_private_key_nss.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/crypto/rsa_private_key_nss.cc b/crypto/rsa_private_key_nss.cc index f5d4222..bac7281 100644 --- a/crypto/rsa_private_key_nss.cc +++ b/crypto/rsa_private_key_nss.cc @@ -75,7 +75,7 @@ RSAPrivateKey* RSAPrivateKey::CreateSensitiveFromPrivateKeyInfo( const std::vector<uint8>& input) { return CreateFromPrivateKeyInfoWithParams(input, PR_TRUE /* permanent */, - PR_TRUE /* seneitive */); + PR_TRUE /* sensitive */); } // static @@ -105,8 +105,9 @@ RSAPrivateKey* RSAPrivateKey::FindFromPublicKeyInfo( return NULL; } - // Now, look for the associated private key in the user's NSS DB. If it's - // not there, consider that an error. + // Now, look for the associated private key in the user's + // hardware-backed NSS DB. If it's not there, consider that an + // error. PK11SlotInfo *slot = GetPrivateNSSKeySlot(); if (!slot) { NOTREACHED(); |