summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-12-10 01:14:52 +0000
committerMoonchild <moonchild@palemoon.org>2020-12-23 19:45:11 +0000
commitae775e493b6d3f3c866aa31b5897563d364d698d (patch)
treeb64b9e7e83d1e592d406c30c8379db870366aff1
parent029bcfe189eae5eebbaf58ccff4e1200dd78b228 (diff)
downloadUXP-ae775e493b6d3f3c866aa31b5897563d364d698d.tar
UXP-ae775e493b6d3f3c866aa31b5897563d364d698d.tar.gz
UXP-ae775e493b6d3f3c866aa31b5897563d364d698d.tar.lz
UXP-ae775e493b6d3f3c866aa31b5897563d364d698d.tar.xz
UXP-ae775e493b6d3f3c866aa31b5897563d364d698d.zip
Issue #1693 - Additional configuration for NSS lib update.
The Seed and RC2 components are completely obsolete, so we shouldn't build them. AVX2 for Chacha20-Poly1305 would fall outside of our platform sysreqs, and has a build system issue with non-MSVC flags being passed (needs more research, also a recent change around NSS 3.53 when the makefile destruction happened)
-rw-r--r--config/external/nss/Makefile.in7
1 files changed, 7 insertions, 0 deletions
diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in
index 7289e57f4..f94c4d8db 100644
--- a/config/external/nss/Makefile.in
+++ b/config/external/nss/Makefile.in
@@ -174,6 +174,13 @@ DEFAULT_GMAKE_FLAGS += NSS_SSL_ENABLE_ZLIB=
# Disable building of the test programs in security/nss/lib/zlib
DEFAULT_GMAKE_FLAGS += PROGRAMS=
+# Disable AVX2 for poly1305
+DEFAULT_GMAKE_FLAGS += NSS_DISABLE_AVX2=1
+
+# Disable obsolete ciphers
+DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DEPRECATED_SEED=1
+DEFAULT_GMAKE_FLAGS += NSS_DISABLE_DEPRECATED_RC2=1
+
# Disable creating .chk files. They will be generated from packager.mk
# When bug 681624 lands, we can replace CHECKLOC= with SKIP_SHLIBSIGN=1
DEFAULT_GMAKE_FLAGS += CHECKLOC=