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

crypto/nss_util.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/nss_util.h"
 #include "crypto/nss_util_internal.h"
 
 #include <nss.h>
 #include <plarena.h>
 #include <prerror.h>
@@ skipping 38 matching lines @@
 #endif  // defined(USE_NSS)
 
 namespace crypto {
 
 namespace {
 
 #if defined(OS_CHROMEOS)
 const char kNSSDatabaseName[] = "Real NSS database";
 
 // Constants for loading opencryptoki.
-const char kOpencryptokiModuleName[] = "opencryptoki";
-const char kOpencryptokiPath[] = "/usr/lib/opencryptoki/libopencryptoki.so";
+const char kOpencryptokiModuleName[] = "Chaps";
+const char kOpencryptokiPath[] = "libchaps.so";

[gauravsh, 2011/11/14 17:49:24]

Doesn't this need to be the complete absolute path?

[Darren Krahn, 2011/11/14 23:32:26]

No... because libchaps.so is in /usr/lib

On 2011/11/14 17:49:24, gauravsh wrote:

[wtc, 2011/11/15 03:13:58]

The comment on line 58 and the constant names on lines 59-60
should be updated to mention chaps instead of opencryptoki,
or use something more generic such as "Chrome OS PKCS #11
library".

[Darren Krahn, 2011/11/16 17:41:17]

Done.

 
 // Fake certificate authority database used for testing.
 static const FilePath::CharType kReadOnlyCertDB[] =
     FILE_PATH_LITERAL("/etc/fake_root_ca/nssdb");
 #endif  // defined(OS_CHROMEOS)
 
 std::string GetNSSErrorMessage() {
   std::string result;
   if (PR_GetErrorTextLength()) {
     scoped_array<char> error_text(new char[PR_GetErrorTextLength() + 1]);
@@ skipping 719 matching lines @@
 
 PK11SlotInfo* GetPublicNSSKeySlot() {
   return g_nss_singleton.Get().GetPublicNSSKeySlot();
 }
 
 PK11SlotInfo* GetPrivateNSSKeySlot() {
   return g_nss_singleton.Get().GetPrivateNSSKeySlot();
 }
 
 }  // namespace crypto