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:

diff --git a/configure.in b/configure.in

--- a/configure.in

+++ b/configure.in

@@ -8207,16 +8207,31 @@ if test "$MOZ_ENABLE_SKIA"; then

     MOZ_ENABLE_SKIA_GPU=1

     AC_DEFINE(USE_SKIA_GPU)

     AC_SUBST(MOZ_ENABLE_SKIA_GPU)

   fi

 fi

 AC_SUBST(MOZ_ENABLE_SKIA)

 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/src/moz.build b/security/manager/ssl/src/moz.build

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

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

@@ -77,16 +77,19 @@ SOURCES += [

     'nsNSSVersion.cpp',

     'PSMContentListener.cpp',

 ]

 LOCAL_INCLUDES += [

     '/security/manager/boot/src',

 ]

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

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

+

 if not CONFIG['MOZ_NO_SMART_CARDS']:

     UNIFIED_SOURCES += [

         'nsSmartCardMonitor.cpp',

     ]

 if CONFIG['MOZ_XUL']:

     UNIFIED_SOURCES += [

         'nsCertTree.cpp',

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

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

+++ b/security/manager/ssl/src/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 "mozilla/Telemetry.h"

 #include "nsAppDirectoryServiceDefs.h"

 #include "nsCertVerificationThread.h"

 #include "nsAppDirectoryServiceDefs.h"

@@ -996,17 +1003,31 @@ nsNSSComponent::InitializeNSS()

   if (NS_FAILED(rv)) {

     nsPSMInitPanic::SetPanic();

     return NS_ERROR_NOT_AVAILABLE;

   }

   SECStatus init_rv = SECFailure;

   if (!profileStr.IsEmpty()) {

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

-    SECStatus init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);

+#ifdef MOZ_ENABLE_NSSHELPER

+    if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {

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

+    } else {

+      uint32_t flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;

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

+

+      if (init_rv != SECSuccess) {

+        PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get()));

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

+      }

+    }

+#else

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

+#endif

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

     if (init_rv != SECSuccess) {

       PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init NSS r/w in %s\n", profileStr.get()));

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

     }

     if (init_rv != SECSuccess) {

       PR_LOG(gPIPNSSLog, PR_LOG_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

@@ -208,16 +208,18 @@ if CONFIG['MOZ_B2G_CAMERA']:

         'stagefright_omx',

     ]

 if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['OS_TARGET'] != 'Android':

     OS_LIBS += [

         'rt',

     ]

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

+

 OS_LIBS += CONFIG['MOZ_CAIRO_OSLIBS']

 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS']

 if CONFIG['MOZ_NATIVE_JPEG']:

     OS_LIBS += CONFIG['MOZ_JPEG_LIBS']

 if CONFIG['MOZ_NATIVE_PNG']:

     OS_LIBS += CONFIG['MOZ_PNG_LIBS']