Merge 104421 - Fix library paths for preloading NSS on Ubuntu 11.10.

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 11 matching lines @@
 
 #include "base/environment.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/native_library.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
+#include "build/build_config.h"
 #include "crypto/scoped_nss_types.h"
 
 // USE_NSS means we use NSS for everything crypto-related.  If USE_NSS is not
 // defined, such as on Mac and Windows, we use NSS for SSL only -- we don't
 // use NSS for crypto or certificate verification, and we don't use the NSS
 // certificate and key databases.
 #if defined(USE_NSS)
 #include "base/synchronization/lock.h"
 #include "crypto/crypto_module_blocking_password_delegate.h"
 #endif  // defined(USE_NSS)
@@ skipping 554 matching lines @@
 
 void LoadNSSLibraries() {
   // Some NSS libraries are linked dynamically so load them here.
 #if defined(USE_NSS)
   // Try to search for multiple directories to load the libraries.
   std::vector<FilePath> paths;
 
   // Use relative path to Search PATH for the library files.
   paths.push_back(FilePath());
 
-  // For Debian derivaties NSS libraries are located here.
+  // For Debian derivatives NSS libraries are located here.
   paths.push_back(FilePath("/usr/lib/nss"));
 
+  // Ubuntu 11.10 (Oneiric) places the libraries here.
+#if defined(ARCH_CPU_X86_64)
+  paths.push_back(FilePath("/usr/lib/x86_64-linux-gnu/nss"));
+#elif defined(ARCH_CPU_X86)
+  paths.push_back(FilePath("/usr/lib/i386-linux-gnu/nss"));
+#elif defined(ARCH_CPU_ARMEL)
+  paths.push_back(FilePath("/usr/lib/arm-linux-gnueabi/nss"));
+#endif
+
   // A list of library files to load.
   std::vector<std::string> libs;
   libs.push_back("libsoftokn3.so");
   libs.push_back("libfreebl3.so");
 
   // For each combination of library file and path, check for existence and
   // then load.
   size_t loaded = 0;
   for (size_t i = 0; i < libs.size(); ++i) {
     for (size_t j = 0; j < paths.size(); ++j) {
       FilePath path = paths[j].Append(libs[i]);
       base::NativeLibrary lib = base::LoadNativeLibrary(path, NULL);
       if (lib) {
         ++loaded;
         break;
       }
     }
   }
 
   if (loaded == libs.size()) {
     VLOG(3) << "NSS libraries loaded.";
   } else {
-    LOG(WARNING) << "Failed to load NSS libraries.";
+    LOG(ERROR) << "Failed to load NSS libraries.";
   }
 #endif
 }
 
 bool CheckNSSVersion(const char* version) {
   return !!NSS_VersionCheck(version);
 }
 
 #if defined(USE_NSS)
 bool OpenTestNSSDB(const FilePath& path, const char* description) {
@@ skipping 83 matching lines @@
 
 PK11SlotInfo* GetPublicNSSKeySlot() {
   return g_nss_singleton.Get().GetPublicNSSKeySlot();
 }
 
 PK11SlotInfo* GetPrivateNSSKeySlot() {
   return g_nss_singleton.Get().GetPrivateNSSKeySlot();
 }
 
 }  // namespace crypto