From: Hans Petter Jansson <hpj@copyleft.no>

      Wolfgang Rosenauer <wr@rosenauer.org>

Subject: use libnsssharedhelper if available at compile time

         (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1)

References:

     AC_DEFINE(USE_SKIA_GPU)

     AC_SUBST(MOZ_ENABLE_SKIA_GPU)

   fi

 fi

 AC_SUBST(MOZ_ENABLE_SKIA)

 AC_SUBST_LIST(SKIA_INCLUDES)

 dnl ========================================================

+dnl Check for nss-shared-helper

+dnl ========================================================

+

+  PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper,

+    [MOZ_ENABLE_NSSHELPER=1],

+    [MOZ_ENABLE_NSSHELPER=])

+

+if test "$MOZ_ENABLE_NSSHELPER"; then

+  AC_DEFINE(MOZ_ENABLE_NSSHELPER)

+fi

+AC_SUBST(MOZ_ENABLE_NSSHELPER)

+AC_SUBST_LIST(NSSHELPER_CFLAGS)

+AC_SUBST_LIST(NSSHELPER_LIBS)

+

+dnl ========================================================

 dnl disable xul

 dnl ========================================================

 MOZ_ARG_DISABLE_BOOL(xul,

 [  --disable-xul           Disable XUL],

     MOZ_XUL= )

 if test "$MOZ_XUL"; then

   AC_DEFINE(MOZ_XUL)

 else

diff --git a/security/manager/ssl/moz.build b/security/manager/ssl/moz.build

--- a/security/manager/ssl/moz.build

+++ b/security/manager/ssl/moz.build

@@ -160,16 +160,19 @@ UNIFIED_SOURCES += [

 FINAL_LIBRARY = 'xul'

 LOCAL_INCLUDES += [

     '/dom/base',

     '/security/certverifier',

     '/security/pkix/include',

 ]

+CXXFLAGS += sorted(CONFIG['NSSHELPER_CFLAGS'])

+OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS'])

+

 LOCAL_INCLUDES += [

     '!/dist/public/nss',

 ]

 if CONFIG['NSS_DISABLE_DBM']:

     DEFINES['NSS_DISABLE_DBM'] = '1'

 DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True'

diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp

--- a/security/manager/ssl/nsNSSComponent.cpp

+++ b/security/manager/ssl/nsNSSComponent.cpp

@@ -1,14 +1,21 @@

 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-

  *

  * This Source Code Form is subject to the terms of the Mozilla Public

  * License, v. 2.0. If a copy of the MPL was not distributed with this

  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

+#ifdef MOZ_ENABLE_NSSHELPER

+#pragma GCC visibility push(default)

+#include <nss-shared-helper.h>

+#pragma GCC visibility pop

+#include "prenv.h"

+#endif

+

 #include "nsNSSComponent.h"

 #include "ExtendedValidation.h"

 #include "NSSCertDBTrustDomain.h"

 #include "SharedSSLState.h"

 #include "mozilla/Preferences.h"

 #include "mozilla/PublicSSL.h"

 #include "mozilla/Services.h"

       return rv;

     }

   }

   MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("inSafeMode: %u\n", inSafeMode));

   if (!nocertdb && !profileStr.IsEmpty()) {

     // First try to initialize the NSS DB in read/write mode.

     // Only load PKCS11 modules if we're not in safe mode.

+#ifdef MOZ_ENABLE_NSSHELPER

+    if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {

+      init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false, !inSafeMode);

+    } else {

+      uint32_t flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;

+      init_rv = ::nsshelp_open_db ("Firefox", profileStr.get(), flags);

+

+      if (init_rv != SECSuccess) {

+        MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get()));

+        init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false, !inSafeMode);

+      }

+    }

+#else

     init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false, !inSafeMode);

+#endif

     // If that fails, attempt read-only mode.

     if (init_rv != SECSuccess) {

       MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("could not init NSS r/w in %s\n", profileStr.get()));

       init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true, !inSafeMode);

     }

     if (init_rv != SECSuccess) {

       MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("could not init in r/o either\n"));

     }

diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build

--- a/toolkit/library/moz.build

+++ b/toolkit/library/moz.build

     OS_LIBS += [

         'rt',

     ]

+OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS'])

+

 if CONFIG['MOZ_NATIVE_JPEG']:

     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']

 if CONFIG['MOZ_NATIVE_PNG']:

     OS_LIBS += CONFIG['MOZ_PNG_LIBS']