Change the Chrome OS PKCS #11 module from libopencryptoki.so to libchaps.so.

This CL is part of a larger effort to replace opencryptoki as the PKCS #11 layer in Chrome OS.  In this first phase, libchaps.so forwards requests to a daemon (chapsd) which loads opencryptoki to service the requests.  You can find the Chaps design doc here: https://docs.google.com/a/google.com/document/d/1TQFc6GABKa1JgwUx2hIcxAHQ329fkd03yYlGxhfHQlQ/edit

Change-Id: I42962c4703413039641b6ede40caaf0c97ab900e

BUG=chromium-os:21005
TEST=* Ensure previously existing certs still exist.
     * Import new cert and private key from PKCS12 file.


Review URL: http://codereview.chromium.org/8527006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110435 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

diff --git a/crypto/nss_util.h b/crypto/nss_util.h
index b87b4a0..a617224 100644
--- a/crypto/nss_util.h
+++ b/crypto/nss_util.h
@@ -110,7 +110,7 @@ class CRYPTO_EXPORT TPMTokenInfoDelegate {
                             std::string* user_pin) const = 0;
 };
 
-// Indicates that NSS should load the opencryptoki library so that we
+// Indicates that NSS should load the Chaps library so that we
 // can access the TPM through NSS.  Once this is called,
 // GetPrivateNSSKeySlot() will return the TPM slot if one was found.
 // Takes ownership of the passed-in delegate object so it can access
@@ -128,7 +128,7 @@ CRYPTO_EXPORT bool IsTPMTokenAvailable();
 
 // Returns true if the TPM is owned and PKCS#11 initialized with the
 // user and security officer PINs, and has been enabled in NSS by
-// calling EnableTPMForNSS, and opencryptoki has been successfully
+// calling EnableTPMForNSS, and Chaps has been successfully
 // loaded into NSS.
 CRYPTO_EXPORT bool IsTPMTokenReady();