bf5fb37f98
* rebased patches
* requires NSS 3.15.2 or above
* MFSA 2013-93/CVE-2013-5590/CVE-2013-5591/CVE-2013-5592
Miscellaneous memory safety hazards
* MFSA 2013-94/CVE-2013-5593 (bmo#868327)
Spoofing addressbar through SELECT element
* MFSA 2013-95/CVE-2013-5604 (bmo#914017)
Access violation with XSLT and uninitialized data
* MFSA 2013-96/CVE-2013-5595 (bmo#916580)
Improperly initialized memory and overflows in some JavaScript
functions
* MFSA 2013-97/CVE-2013-5596 (bmo#910881)
Writing to cycle collected object during image decoding
* MFSA 2013-98/CVE-2013-5597 (bmo#918864)
Use-after-free when updating offline cache
* MFSA 2013-99/CVE-2013-5598 (bmo#920515)
Security bypass of PDF.js checks using iframes
* MFSA 2013-100/CVE-2013-5599/CVE-2013-5600/CVE-2013-5601
(bmo#915210, bmo#915576, bmo#916685)
Miscellaneous use-after-free issues found through ASAN fuzzing
* MFSA 2013-101/CVE-2013-5602 (bmo#897678)
Memory corruption in workers
* MFSA 2013-102/CVE-2013-5603 (bmo#916404)
Use-after-free in HTML document templates
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=356
145 lines
5.0 KiB
Diff
145 lines
5.0 KiB
Diff
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
|
|
@@ -8289,16 +8289,31 @@ AC_SUBST(QCMS_LIBS)
|
|
|
|
dnl ========================================================
|
|
dnl HarfBuzz
|
|
dnl ========================================================
|
|
MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)'
|
|
AC_SUBST(MOZ_HARFBUZZ_LIBS)
|
|
|
|
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(NSSHELPER_CFLAGS)
|
|
+AC_SUBST(NSSHELPER_LIBS)
|
|
+
|
|
+dnl ========================================================
|
|
dnl SIL Graphite
|
|
dnl ========================================================
|
|
MOZ_GRAPHITE_LIBS='$(DEPTH)/gfx/graphite2/src/$(LIB_PREFIX)mozgraphite2.$(LIB_SUFFIX)'
|
|
AC_SUBST(MOZ_GRAPHITE_LIBS)
|
|
|
|
dnl ========================================================
|
|
dnl OTS
|
|
dnl ========================================================
|
|
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
|
|
--- a/security/manager/ssl/src/Makefile.in
|
|
+++ b/security/manager/ssl/src/Makefile.in
|
|
@@ -18,10 +18,13 @@ LIBXUL_LIBRARY = 1
|
|
CSRCS += md4.c
|
|
|
|
DEFINES += \
|
|
-DNSS_ENABLE_ECC \
|
|
-DDLL_PREFIX=\"$(DLL_PREFIX)\" \
|
|
-DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
|
|
$(NULL)
|
|
|
|
+LOCAL_INCLUDES += $(NSSHELPER_CFLAGS)
|
|
+EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
|
|
+
|
|
include $(topsrcdir)/config/rules.mk
|
|
|
|
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
|
|
@@ -3,16 +3,23 @@
|
|
* 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_LOGGING
|
|
#define FORCE_PR_LOG 1
|
|
#endif
|
|
|
|
+#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 "CertVerifier.h"
|
|
#include "nsCertVerificationThread.h"
|
|
#include "nsAppDirectoryServiceDefs.h"
|
|
#include "nsComponentManagerUtils.h"
|
|
#include "nsDirectoryServiceDefs.h"
|
|
#include "nsICertOverrideService.h"
|
|
@@ -1144,18 +1151,34 @@ nsNSSComponent::InitializeNSS(bool showW
|
|
ConfigureInternalPKCS11Token();
|
|
|
|
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
|
|
// module by NSS_Initialize because we will load it in InstallLoadableRoots
|
|
// later. It also allows us to work around a bug in the system NSS in
|
|
// Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as
|
|
// "/usr/lib/nss/libnssckbi.so".
|
|
uint32_t init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;
|
|
- SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "",
|
|
- SECMOD_DB, init_flags);
|
|
+ SECStatus init_rv = SECFailure;
|
|
+#ifdef MOZ_ENABLE_NSSHELPER
|
|
+ if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {
|
|
+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
|
|
+ SECMOD_DB, init_flags);
|
|
+ } else {
|
|
+ init_rv = ::nsshelp_open_db ("Firefox", profileStr.get(), init_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 = ::NSS_Initialize(profileStr.get(), "", "",
|
|
+ SECMOD_DB, init_flags);
|
|
+ }
|
|
+ }
|
|
+#else
|
|
+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
|
|
+ SECMOD_DB, init_flags);
|
|
+#endif
|
|
|
|
if (init_rv != SECSuccess) {
|
|
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get()));
|
|
|
|
if (supress_warning_preference) {
|
|
which_nss_problem = problem_none;
|
|
}
|
|
else {
|
|
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
|
|
--- a/toolkit/library/Makefile.in
|
|
+++ b/toolkit/library/Makefile.in
|
|
@@ -490,17 +490,17 @@ ifneq (,$(or $(filter 1400,$(_MSC_VER)),
|
|
ifdef MOZ_DEBUG
|
|
EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
|
|
endif
|
|
endif
|
|
endif
|
|
|
|
EXTRA_DSO_LDOPTS += $(LIBS_DIR)
|
|
|
|
-EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB)
|
|
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS)
|
|
|
|
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
|
CXXFLAGS += $(TK_CFLAGS)
|
|
OS_LIBS += \
|
|
-framework SystemConfiguration \
|
|
-framework QTKit \
|
|
-framework IOKit \
|
|
-F/System/Library/PrivateFrameworks -framework CoreUI \
|