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

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

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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=106881
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=106882

[Will Drewry, 2011-10-22 19:05:40]

lgtm

One nit, but I think this makes sense for now.

http://codereview.chromium.org/8373022/diff/1/crypto/hmac_nss.cc
File crypto/hmac_nss.cc (right):

http://codereview.chromium.org/8373022/diff/1/crypto/hmac_nss.cc#newcode55
crypto/hmac_nss.cc:55: #if defined(OS_CHROMEOS)
Might be worth putting in a comment explaining why Public is used instead of the
best match.  I think we may have some weirdness with the TPM token registration
v readiness, but who knows.  Could be good to note there may be a nastier
problem hiding away in here.

[zel, 2011-10-22 19:13:15]

http://codereview.chromium.org/8373022/diff/1/crypto/hmac_nss.cc
File crypto/hmac_nss.cc (right):

http://codereview.chromium.org/8373022/diff/1/crypto/hmac_nss.cc#newcode55
crypto/hmac_nss.cc:55: #if defined(OS_CHROMEOS)
On 2011/10/22 19:05:40, Will Drewry wrote:
> Might be worth putting in a comment explaining why Public is used instead of
the
> best match.  I think we may have some weirdness with the TPM token
registration
> v readiness, but who knows.  Could be good to note there may be a nastier
> problem hiding away in here.

Done.

[commit-bot: I haz the power, 2011-10-22 22:42:30]

No LGTM from valid reviewers yet.

[wtc, 2011-10-22 22:58:23]

Patch Set 2 LGTM.

But I propose a simpler solution that does not require the
#if defined(CHROME_OS).  Please give it a try.

http://codereview.chromium.org/8373022/diff/2002/crypto/hmac_nss.cc
File crypto/hmac_nss.cc (right):

http://codereview.chromium.org/8373022/diff/2002/crypto/hmac_nss.cc#newcode62
crypto/hmac_nss.cc:62: plat_->slot_.reset(PK11_GetBestSlot(plat_->mechanism_,
NULL));

Please try
    plat_->slot_.reset(PK11_GetInternalSlot());

If that works, that's my preferred solution.

PK11_GetInternalSlot() returns a slot in the NSS soft token
that does not need the NSS cert/key databases.  Since we
don't need to store the HMAC key persistently on line 74
below, using this slot is enough.

[zel, 2011-10-23 21:50:26]

PK11_GetInternalSlot() seems to be working as well. I will submit that version.

[commit-bot: I haz the power, 2011-10-23 21:50:51]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/zelidrag@chromium.org/8373022/4002

[commit-bot: I haz the power, 2011-10-23 21:50:53]

Failed to send try job 8373022-4002: 2