summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-02-14 15:06:49 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-02-14 15:06:49 +0100
commit7273e371bec8042699d27f3ada83f1f50073ac15 (patch)
treef8fa84d1ed25048b4e795a22a7a2d7338f01876e /external
parent9dc337e9d073352cd9c9018d30b40bd4dcd5b1cb (diff)
Linux x86 nss/lib/freebl/mpi/mpi_x86.s confusion of mp_digit size
see <https://groups.google.com/forum/#!topic/mozilla.dev.security/n16bQj4qZHc> Change-Id: I6635d187b29d6b50fbccaf3f4c29d72660fcaa5e
Diffstat (limited to 'external')
-rw-r--r--external/nss/UnpackedTarball_nss.mk1
-rw-r--r--external/nss/nss-linux-x86.patch.010
2 files changed, 11 insertions, 0 deletions
diff --git a/external/nss/UnpackedTarball_nss.mk b/external/nss/UnpackedTarball_nss.mk
index 15a02d2197b8..17eb436d3282 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.aix.patch \
external/nss/nss-3.13.5-zlib-werror.patch \
external/nss/nss_macosx.patch \
+ external/nss/nss-linux-x86.patch.0 \
$(if $(filter WNTMSC,$(OS)$(COM)),external/nss/nss.windows.patch) \
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \
diff --git a/external/nss/nss-linux-x86.patch.0 b/external/nss/nss-linux-x86.patch.0
new file mode 100644
index 000000000000..e23a786a05f3
--- /dev/null
+++ b/external/nss/nss-linux-x86.patch.0
@@ -0,0 +1,10 @@
+--- nss/lib/freebl/Makefile
++++ nss/lib/freebl/Makefile
+@@ -195,6 +195,7 @@
+ ifeq ($(CPU_ARCH),x86)
+ ASFILES = mpi_x86.s
+ DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE
++ DEFINES += -DMP_USE_UINT_DIGIT
+ DEFINES += -DMP_ASSEMBLY_DIV_2DX1D
+ DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
+ # The floating point ECC code doesn't work on Linux x86 (bug 311432).