This change loads opencryptoki and uses the TPM for keygen tags.

base/nss_util_internal.h

Index: base/nss_util_internal.h
diff --git a/base/nss_util_internal.h b/base/nss_util_internal.h
index 139740b4ab367935de237a73b561901697fe1e6a..be8436a625b094e6cb181a184cecbe58e9a6c1bd 100644
--- a/base/nss_util_internal.h
+++ b/base/nss_util_internal.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -13,9 +13,17 @@
 
 namespace base {
 
-// Returns a reference to the default NSS key slot. Caller must release
-// reference with PK11_FreeSlot.
-PK11SlotInfo* GetDefaultNSSKeySlot();
+// Returns a reference to the default NSS key slot for storing
+// public-key data only (e.g. server certs). Caller must release
+// returned reference with PK11_FreeSlot.
+PK11SlotInfo* GetPublicNSSKeySlot();
+
+// Returns a reference to the default slot for storing private-key and
+// mixed private-key/public-key data.  Returns a hardware (TPM) NSS
+// key slot if on ChromeOS and EnableTPMForNSS() has been called
+// successfully. Caller must release returned reference with
+// PK11_FreeSlot.
+PK11SlotInfo* GetPrivateNSSKeySlot();
 
 }  // namespace base