author | Wolfgang Rosenauer <wr@rosenauer.org> |
Thu, 13 Jan 2011 12:12:14 +0100 | |
changeset 217 | 4b1284f6082b |
parent 191 | 14282ac75832 |
child 289 | 3c0dff7ca9c4 |
permissions | -rw-r--r-- |
1 | 1 |
From: Hans Petter Jansson <hpj@copyleft.no> |
2 |
Wolfgang Rosenauer <wr@rosenauer.org> |
|
3 |
Subject: use libnsssharedhelper if available at compile time |
|
4 |
(can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) |
|
5 |
References: |
|
6 |
||
7 |
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in |
|
8 |
--- a/config/autoconf.mk.in |
|
9 |
+++ b/config/autoconf.mk.in |
|
191
14282ac75832
update to FIREFOX_4_0b7_BUILD1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
10 |
@@ -571,16 +571,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS |
1 | 11 |
|
12 |
GLIB_CFLAGS = @GLIB_CFLAGS@ |
|
13 |
GLIB_LIBS = @GLIB_LIBS@ |
|
14 |
GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ |
|
15 |
LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ |
|
16 |
LIBIDL_LIBS = @LIBIDL_LIBS@ |
|
17 |
STATIC_LIBIDL = @STATIC_LIBIDL@ |
|
18 |
||
19 |
+MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@ |
|
20 |
+NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@ |
|
21 |
+NSSHELPER_LIBS = @NSSHELPER_LIBS@ |
|
22 |
+ |
|
23 |
MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ |
|
24 |
||
164
995e803e8198
rebase patches to snapshot 20100929
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
125
diff
changeset
|
25 |
export CL_INCLUDES_PREFIX = @CL_INCLUDES_PREFIX@ |
995e803e8198
rebase patches to snapshot 20100929
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
125
diff
changeset
|
26 |
|
1 | 27 |
MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ |
28 |
COMPILER_DEPEND = @COMPILER_DEPEND@ |
|
29 |
MDDEPDIR := @MDDEPDIR@ |
|
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
30 |
CC_WRAPPER = @CC_WRAPPER@ |
1 | 31 |
diff --git a/configure.in b/configure.in |
32 |
--- a/configure.in |
|
33 |
+++ b/configure.in |
|
191
14282ac75832
update to FIREFOX_4_0b7_BUILD1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
34 |
@@ -8610,16 +8610,31 @@ AC_SUBST(QCMS_LIBS) |
1 | 35 |
|
36 |
dnl ======================================================== |
|
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
37 |
dnl HarfBuzz |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
38 |
dnl ======================================================== |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
39 |
MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
40 |
AC_SUBST(MOZ_HARFBUZZ_LIBS) |
1 | 41 |
|
42 |
dnl ======================================================== |
|
43 |
+dnl Check for nss-shared-helper |
|
44 |
+dnl ======================================================== |
|
45 |
+ |
|
191
14282ac75832
update to FIREFOX_4_0b7_BUILD1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
46 |
+ PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, |
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
47 |
+ [MOZ_ENABLE_NSSHELPER=1], |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
48 |
+ [MOZ_ENABLE_NSSHELPER=]) |
1 | 49 |
+ |
50 |
+if test "$MOZ_ENABLE_NSSHELPER"; then |
|
51 |
+ AC_DEFINE(MOZ_ENABLE_NSSHELPER) |
|
52 |
+fi |
|
53 |
+AC_SUBST(MOZ_ENABLE_NSSHELPER) |
|
54 |
+AC_SUBST(NSSHELPER_CFLAGS) |
|
55 |
+AC_SUBST(NSSHELPER_LIBS) |
|
56 |
+ |
|
57 |
+dnl ======================================================== |
|
191
14282ac75832
update to FIREFOX_4_0b7_BUILD1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
58 |
dnl OTS |
14282ac75832
update to FIREFOX_4_0b7_BUILD1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
59 |
dnl ======================================================== |
14282ac75832
update to FIREFOX_4_0b7_BUILD1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
60 |
MOZ_OTS_LIBS='$(DEPTH)/gfx/ots/src/$(LIB_PREFIX)mozots.$(LIB_SUFFIX)' |
14282ac75832
update to FIREFOX_4_0b7_BUILD1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
61 |
AC_SUBST(MOZ_OTS_LIBS) |
14282ac75832
update to FIREFOX_4_0b7_BUILD1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
62 |
|
14282ac75832
update to FIREFOX_4_0b7_BUILD1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
63 |
dnl ======================================================== |
1 | 64 |
dnl disable xul |
65 |
dnl ======================================================== |
|
66 |
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
|
67 |
--- a/security/manager/ssl/src/Makefile.in |
|
68 |
+++ b/security/manager/ssl/src/Makefile.in |
|
191
14282ac75832
update to FIREFOX_4_0b7_BUILD1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
69 |
@@ -117,19 +117,20 @@ CSRCS += md4.c |
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
70 |
|
1 | 71 |
|
72 |
EXTRA_DEPS = $(NSS_DEP_LIBS) |
|
73 |
||
74 |
DEFINES += -DNSS_ENABLE_ECC |
|
75 |
||
76 |
# Use local includes because they are inserted before INCLUDES |
|
77 |
# so that Mozilla's nss.h is used, not glibc's |
|
78 |
-LOCAL_INCLUDES += $(NSS_CFLAGS) |
|
79 |
+LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS) |
|
80 |
||
81 |
EXTRA_DSO_LDOPTS += \ |
|
82 |
$(MOZ_UNICHARUTIL_LIBS) \ |
|
83 |
$(MOZ_COMPONENT_LIBS) \ |
|
84 |
$(MOZ_JS_LIBS) \ |
|
85 |
+ $(NSSHELPER_LIBS) \ |
|
86 |
$(NSS_LIBS) \ |
|
87 |
$(NULL) |
|
88 |
||
89 |
include $(topsrcdir)/config/rules.mk |
|
90 |
||
91 |
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
|
92 |
--- a/security/manager/ssl/src/nsNSSComponent.cpp |
|
93 |
+++ b/security/manager/ssl/src/nsNSSComponent.cpp |
|
94 |
@@ -39,16 +39,23 @@ |
|
95 |
* use your version of this file under the terms of the MPL, indicate your |
|
96 |
* decision by deleting the provisions above and replace them with the notice |
|
97 |
* and other provisions required by the GPL or the LGPL. If you do not delete |
|
98 |
* the provisions above, a recipient may use your version of this file under |
|
99 |
* the terms of any one of the MPL, the GPL or the LGPL. |
|
100 |
* |
|
101 |
* ***** END LICENSE BLOCK ***** */ |
|
102 |
||
103 |
+#ifdef MOZ_ENABLE_NSSHELPER |
|
104 |
+#pragma GCC visibility push(default) |
|
105 |
+#include <nss-shared-helper.h> |
|
106 |
+#pragma GCC visibility pop |
|
107 |
+#include "prenv.h" |
|
108 |
+#endif |
|
109 |
+ |
|
110 |
#include "nsNSSComponent.h" |
|
111 |
#include "nsNSSCallbacks.h" |
|
112 |
#include "nsNSSIOLayer.h" |
|
113 |
#include "nsSSLThread.h" |
|
114 |
#include "nsCertVerificationThread.h" |
|
115 |
||
116 |
#include "nsNetUtil.h" |
|
117 |
#include "nsAppDirectoryServiceDefs.h" |
|
191
14282ac75832
update to FIREFOX_4_0b7_BUILD1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
118 |
@@ -1658,18 +1665,34 @@ nsNSSComponent::InitializeNSS(PRBool sho |
1 | 119 |
ConfigureInternalPKCS11Token(); |
120 |
||
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
121 |
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
122 |
// module by NSS_Initialize because we will load it in InstallLoadableRoots |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
123 |
// later. It also allows us to work around a bug in the system NSS in |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
124 |
// Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
125 |
// "/usr/lib/nss/libnssckbi.so". |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
126 |
PRUint32 init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
127 |
- SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "", |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
128 |
- SECMOD_DB, init_flags); |
1 | 129 |
+ SECStatus init_rv = SECFailure; |
130 |
+#ifdef MOZ_ENABLE_NSSHELPER |
|
131 |
+ if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) { |
|
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
132 |
+ init_rv = ::NSS_Initialize(profileStr.get(), "", "", |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
133 |
+ SECMOD_DB, init_flags); |
1 | 134 |
+ } else { |
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
135 |
+ init_rv = ::nsshelp_open_db ("mozilla-xul", profileStr.get(), init_flags); |
1 | 136 |
+ |
137 |
+ if (init_rv != SECSuccess) { |
|
138 |
+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get())); |
|
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
139 |
+ init_rv = ::NSS_Initialize(profileStr.get(), "", "", |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
140 |
+ SECMOD_DB, init_flags); |
1 | 141 |
+ } |
142 |
+ } |
|
143 |
+#else |
|
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
144 |
+ init_rv = ::NSS_Initialize(profileStr.get(), "", "", |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
145 |
+ SECMOD_DB, init_flags); |
1 | 146 |
+#endif |
147 |
||
148 |
if (init_rv != SECSuccess) { |
|
149 |
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); |
|
150 |
||
151 |
if (supress_warning_preference) { |
|
152 |
which_nss_problem = problem_none; |
|
153 |
} |
|
154 |
else { |
|
155 |
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
|
156 |
--- a/toolkit/library/Makefile.in |
|
157 |
+++ b/toolkit/library/Makefile.in |
|
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
158 |
@@ -169,17 +169,17 @@ ifndef MOZ_ENABLE_LIBXUL |
1 | 159 |
EXTRA_DSO_LDOPTS += \ |
160 |
$(MOZ_COMPONENT_LIBS) \ |
|
161 |
$(MOZ_JS_LIBS) \ |
|
162 |
$(NULL) |
|
163 |
endif |
|
164 |
||
165 |
DEFINES += -DIMPL_XREAPI |
|
166 |
||
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
167 |
-EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
168 |
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) |
1 | 169 |
|
170 |
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
|
171 |
CXXFLAGS += $(TK_CFLAGS) |
|
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
172 |
OS_LIBS += \ |
1 | 173 |
-framework SystemConfiguration \ |
174 |
-framework QuickTime \ |
|
175 |
-framework IOKit \ |
|
176 |
-lcrypto \ |