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

crypto/hmac_nss.cc

Index: crypto/hmac_nss.cc
===================================================================
--- crypto/hmac_nss.cc	(revision 106500)
+++ crypto/hmac_nss.cc	(working copy)
@@ -12,6 +12,10 @@
 #include "crypto/nss_util.h"
 #include "crypto/scoped_nss_types.h"
 
+#if defined(OS_CHROMEOS)
+#include "crypto/nss_util_internal.h"
+#endif
+
 namespace crypto {
 
 struct HMACPlatformData {
@@ -48,7 +52,11 @@
     return false;
   }
 
+#if defined(OS_CHROMEOS)

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

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]

Done.

+  plat_->slot_.reset(GetPublicNSSKeySlot());
+#else
   plat_->slot_.reset(PK11_GetBestSlot(plat_->mechanism_, NULL));
+#endif
   if (!plat_->slot_.get()) {
     NOTREACHED();
     return false;