author | Wolfgang Rosenauer <wr@rosenauer.org> |
Sun, 30 Nov 2014 10:11:23 +0100 | |
branch | firefox31 |
changeset 814 | 354545f01596 |
parent 738 | f118b88b7d7f |
child 766 | e0b23b7851e9 |
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/configure.in b/configure.in |
|
8 |
--- a/configure.in |
|
9 |
+++ b/configure.in |
|
738 | 10 |
@@ -8231,16 +8231,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
703 | 11 |
MOZ_ENABLE_SKIA_GPU=1 |
12 |
AC_DEFINE(USE_SKIA_GPU) |
|
13 |
AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
|
14 |
fi |
|
15 |
fi |
|
16 |
AC_SUBST(MOZ_ENABLE_SKIA) |
|
1 | 17 |
|
18 |
dnl ======================================================== |
|
19 |
+dnl Check for nss-shared-helper |
|
20 |
+dnl ======================================================== |
|
21 |
+ |
|
191
14282ac75832
update to FIREFOX_4_0b7_BUILD1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
22 |
+ PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper, |
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
23 |
+ [MOZ_ENABLE_NSSHELPER=1], |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
24 |
+ [MOZ_ENABLE_NSSHELPER=]) |
1 | 25 |
+ |
26 |
+if test "$MOZ_ENABLE_NSSHELPER"; then |
|
27 |
+ AC_DEFINE(MOZ_ENABLE_NSSHELPER) |
|
28 |
+fi |
|
29 |
+AC_SUBST(MOZ_ENABLE_NSSHELPER) |
|
30 |
+AC_SUBST(NSSHELPER_CFLAGS) |
|
31 |
+AC_SUBST(NSSHELPER_LIBS) |
|
32 |
+ |
|
33 |
+dnl ======================================================== |
|
703 | 34 |
dnl disable xul |
191
14282ac75832
update to FIREFOX_4_0b7_BUILD1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
164
diff
changeset
|
35 |
dnl ======================================================== |
703 | 36 |
MOZ_ARG_DISABLE_BOOL(xul, |
37 |
[ --disable-xul Disable XUL], |
|
38 |
MOZ_XUL= ) |
|
39 |
if test "$MOZ_XUL"; then |
|
40 |
AC_DEFINE(MOZ_XUL) |
|
41 |
else |
|
1 | 42 |
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
703 | 43 |
new file mode 100644 |
44 |
--- /dev/null |
|
1 | 45 |
+++ b/security/manager/ssl/src/Makefile.in |
703 | 46 |
@@ -0,0 +1,8 @@ |
47 |
+#! gmake |
|
48 |
+# |
|
49 |
+# This Source Code Form is subject to the terms of the Mozilla Public |
|
50 |
+# License, v. 2.0. If a copy of the MPL was not distributed with this |
|
51 |
+# file, You can obtain one at http://mozilla.org/MPL/2.0/. |
|
686
ab25aac2aa83
Firefox 26.0b5 update
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
680
diff
changeset
|
52 |
+ |
585
5a44d417c9b5
prepare for Beta 18 phase
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
53 |
+LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) |
5a44d417c9b5
prepare for Beta 18 phase
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
568
diff
changeset
|
54 |
+EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) |
1 | 55 |
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
56 |
--- a/security/manager/ssl/src/nsNSSComponent.cpp |
|
57 |
+++ b/security/manager/ssl/src/nsNSSComponent.cpp |
|
596 | 58 |
@@ -3,16 +3,23 @@ |
467
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
59 |
* This Source Code Form is subject to the terms of the Mozilla Public |
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
60 |
* License, v. 2.0. If a copy of the MPL was not distributed with this |
a9baaad57fa4
refreshed patches and removed obsolete ones
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
438
diff
changeset
|
61 |
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
1 | 62 |
|
596 | 63 |
#ifdef MOZ_LOGGING |
64 |
#define FORCE_PR_LOG 1 |
|
65 |
#endif |
|
66 |
||
1 | 67 |
+#ifdef MOZ_ENABLE_NSSHELPER |
68 |
+#pragma GCC visibility push(default) |
|
69 |
+#include <nss-shared-helper.h> |
|
70 |
+#pragma GCC visibility pop |
|
71 |
+#include "prenv.h" |
|
72 |
+#endif |
|
73 |
+ |
|
74 |
#include "nsNSSComponent.h" |
|
653 | 75 |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
76 |
#include "ExtendedValidation.h" |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
77 |
#include "NSSCertDBTrustDomain.h" |
699 | 78 |
#include "mozilla/Telemetry.h" |
1 | 79 |
#include "nsCertVerificationThread.h" |
659 | 80 |
#include "nsAppDirectoryServiceDefs.h" |
81 |
#include "nsComponentManagerUtils.h" |
|
738 | 82 |
@@ -1141,17 +1148,31 @@ nsNSSComponent::InitializeNSS() |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
83 |
if (NS_FAILED(rv)) { |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
84 |
nsPSMInitPanic::SetPanic(); |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
85 |
return NS_ERROR_NOT_AVAILABLE; |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
86 |
} |
1 | 87 |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
88 |
SECStatus init_rv = SECFailure; |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
89 |
if (!profileStr.IsEmpty()) { |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
90 |
// First try to initialize the NSS DB in read/write mode. |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
91 |
- SECStatus init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); |
1 | 92 |
+#ifdef MOZ_ENABLE_NSSHELPER |
93 |
+ if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) { |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
94 |
+ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); |
1 | 95 |
+ } else { |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
96 |
+ uint32_t flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE; |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
97 |
+ init_rv = ::nsshelp_open_db ("Firefox", profileStr.get(), flags); |
1 | 98 |
+ |
99 |
+ if (init_rv != SECSuccess) { |
|
100 |
+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get())); |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
101 |
+ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); |
1 | 102 |
+ } |
103 |
+ } |
|
104 |
+#else |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
105 |
+ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false); |
1 | 106 |
+#endif |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
107 |
// If that fails, attempt read-only mode. |
1 | 108 |
if (init_rv != SECSuccess) { |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
109 |
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init NSS r/w in %s\n", profileStr.get())); |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
110 |
init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true); |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
111 |
} |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
112 |
if (init_rv != SECSuccess) { |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
113 |
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
703
diff
changeset
|
114 |
} |
738 | 115 |
diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk |
116 |
--- a/toolkit/library/libxul.mk |
|
117 |
+++ b/toolkit/library/libxul.mk |
|
118 |
@@ -146,17 +146,17 @@ OS_LIBS += $(call EXPAND_LIBNAME,mfuuid |
|
119 |
endif |
|
120 |
||
121 |
ifdef MOZ_DIRECTSHOW |
|
122 |
OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo) |
|
289
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
191
diff
changeset
|
123 |
endif |
3c0dff7ca9c4
Update to version 6.0b1
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
191
diff
changeset
|
124 |
|
659 | 125 |
EXTRA_DSO_LDOPTS += $(LIBS_DIR) |
1 | 126 |
|
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
127 |
-EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) |
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
128 |
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) |
1 | 129 |
|
130 |
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) |
|
125
bfef1af1ee28
reenable shared nss stuff
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
1
diff
changeset
|
131 |
OS_LIBS += \ |
718 | 132 |
$(TK_LIBS) \ |
133 |
$(NULL) |
|
134 |
endif |
|
135 |
||
738 | 136 |
ifeq (OpenBSD,$(OS_ARCH)) |