5 References: |
5 References: |
6 |
6 |
7 diff --git a/configure.in b/configure.in |
7 diff --git a/configure.in b/configure.in |
8 --- a/configure.in |
8 --- a/configure.in |
9 +++ b/configure.in |
9 +++ b/configure.in |
10 @@ -8099,16 +8099,31 @@ AC_SUBST(QCMS_LIBS) |
10 @@ -8108,16 +8108,31 @@ AC_SUBST(QCMS_LIBS) |
11 |
11 |
12 dnl ======================================================== |
12 dnl ======================================================== |
13 dnl HarfBuzz |
13 dnl HarfBuzz |
14 dnl ======================================================== |
14 dnl ======================================================== |
15 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
15 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
40 MOZ_GRAPHITE_LIBS= |
40 MOZ_GRAPHITE_LIBS= |
41 fi |
41 fi |
42 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
42 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
43 --- a/security/manager/ssl/src/Makefile.in |
43 --- a/security/manager/ssl/src/Makefile.in |
44 +++ b/security/manager/ssl/src/Makefile.in |
44 +++ b/security/manager/ssl/src/Makefile.in |
45 @@ -90,10 +90,13 @@ DEFINES += \ |
45 @@ -93,10 +93,13 @@ DEFINES += \ |
46 -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ |
|
47 $(NULL) |
46 $(NULL) |
48 |
47 |
49 EXPORTS += \ |
48 EXPORTS += \ |
|
49 CryptoTask.h \ |
50 nsNSSShutDown.h \ |
50 nsNSSShutDown.h \ |
51 ScopedNSSTypes.h \ |
51 ScopedNSSTypes.h \ |
52 $(NULL) |
52 $(NULL) |
53 |
53 |
54 +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) |
54 +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) |
57 include $(topsrcdir)/config/rules.mk |
57 include $(topsrcdir)/config/rules.mk |
58 |
58 |
59 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
59 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
60 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
60 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
61 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |
61 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |
62 @@ -1,14 +1,21 @@ |
62 @@ -3,16 +3,23 @@ |
63 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- |
|
64 * |
|
65 * This Source Code Form is subject to the terms of the Mozilla Public |
63 * This Source Code Form is subject to the terms of the Mozilla Public |
66 * License, v. 2.0. If a copy of the MPL was not distributed with this |
64 * License, v. 2.0. If a copy of the MPL was not distributed with this |
67 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
65 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
|
66 |
|
67 #ifdef MOZ_LOGGING |
|
68 #define FORCE_PR_LOG 1 |
|
69 #endif |
68 |
70 |
69 +#ifdef MOZ_ENABLE_NSSHELPER |
71 +#ifdef MOZ_ENABLE_NSSHELPER |
70 +#pragma GCC visibility push(default) |
72 +#pragma GCC visibility push(default) |
71 +#include <nss-shared-helper.h> |
73 +#include <nss-shared-helper.h> |
72 +#pragma GCC visibility pop |
74 +#pragma GCC visibility pop |
79 #include "nsCertVerificationThread.h" |
81 #include "nsCertVerificationThread.h" |
80 |
82 |
81 #include "nsNetUtil.h" |
83 #include "nsNetUtil.h" |
82 #include "nsAppDirectoryServiceDefs.h" |
84 #include "nsAppDirectoryServiceDefs.h" |
83 #include "nsDirectoryService.h" |
85 #include "nsDirectoryService.h" |
84 @@ -1730,18 +1737,34 @@ nsNSSComponent::InitializeNSS(bool showW |
86 @@ -1735,18 +1742,34 @@ nsNSSComponent::InitializeNSS(bool showW |
85 ConfigureInternalPKCS11Token(); |
87 ConfigureInternalPKCS11Token(); |
86 |
88 |
87 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
89 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
88 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
90 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
89 // later. It also allows us to work around a bug in the system NSS in |
91 // later. It also allows us to work around a bug in the system NSS in |