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

crypto/hmac_nss.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "crypto/hmac.h"
 
 #include <nss.h>
 #include <pk11pub.h>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #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 {
   CK_MECHANISM_TYPE mechanism_;
   ScopedPK11Slot slot_;
   ScopedPK11SymKey sym_key_;
 };
 
 HMAC::HMAC(HashAlgorithm hash_alg)
     : hash_alg_(hash_alg), plat_(new HMACPlatformData()) {
@@ skipping 16 matching lines @@
 
 bool HMAC::Init(const unsigned char *key, int key_length) {
   EnsureNSSInit();
 
   if (plat_->slot_.get()) {
     // Init must not be called more than twice on the same HMAC object.
     NOTREACHED();
     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;
   }
 
   SECItem key_item;
   key_item.type = siBuffer;
   key_item.data = const_cast<unsigned char*>(key);  // NSS API isn't const.
   key_item.len = key_length;
 
@@ skipping 46 matching lines @@
   if (PK11_DigestFinal(context.get(),
                        digest, &len, digest_length) != SECSuccess) {
     NOTREACHED();
     return false;
   }
 
   return true;
 }
 
 }  // namespace crypto