chromium/src
0
Fork 0
Code Activity

Fixed slot selection in HMAC class to ensure that we are using softtoken instead of TPM slots.

Browse Source 
BUG=chromium-os:21633
TEST=make sure that user signin works properly on Alex - we should not show Gaia signin screen on second login after system resote
Review URL: http://codereview.chromium.org/8373022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106881 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
zelidrag@chromium.org
2011-10-23 21:52:07 +00:00
parent 39e9012038
commit f55d1b018c
1 changed files with 4 additions and 1 deletions

5
crypto/hmac_nss.cc

@ -48,7 +48,7 @@ bool HMAC::Init(const unsigned char *key, int key_length) {
return false;
}
plat_->slot_.reset(PK11_GetBestSlot(plat_->mechanism_, NULL));
plat_->slot_.reset(PK11_GetInternalSlot());
if (!plat_->slot_.get()) {
NOTREACHED();
return false;
@ -100,6 +100,9 @@ bool HMAC::Sign(const base::StringPiece& data,
if (PK11_DigestOp(context.get(),
reinterpret_cast<const unsigned char*>(data.data()),
data.length()) != SECSuccess) {
LOG(WARNING) << "PK11_DigestOp failed, error " << PORT_GetError()
<< ", slot name " << PK11_GetSlotName(plat_->slot_.get())
<< ", token name " << PK11_GetTokenName(plat_->slot_.get());
NOTREACHED();
return false;
}