diff options
author | Michael Stahl <Michael.Stahl@cib.de> | 2018-08-07 18:11:41 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-11-29 07:51:32 +0100 |
commit | 346707a31ee0a950d694f114aecdefa2ba750e1d (patch) | |
tree | 80c38db350c8d24f4e19c594caa1365670912b4c /external | |
parent | b67d642560d0e13616228a2d3b1e58abc2fd7fa7 (diff) |
nss: upgrade to release 3.38
Fixes CVE-2018-0495 and "the ASN.1 code".
(Remove one hunk of nss-android.patch.1 that should be obsolete with the
current Android toolchain baseline (but that hunk didn't exist in
libreoffice-6-0 or older anyway).)
Change-Id: I5516edec17b72f53acd2749e8840805eead077bc
Reviewed-on: https://gerrit.libreoffice.org/58697
Tested-by: Jenkins
Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
(cherry picked from commit 3ef76067bfa1f9f60ec3989bd6b40a5760137903)
Reviewed-on: https://gerrit.libreoffice.org/58722
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit e4874f777048535650a2bb1ce875e1a6e3e4b7ef)
Diffstat (limited to 'external')
-rw-r--r-- | external/nss/nss.vs2015.patch | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/external/nss/nss.vs2015.patch b/external/nss/nss.vs2015.patch index de4f8762fd5b..c3e6b5a5acaa 100644 --- a/external/nss/nss.vs2015.patch +++ b/external/nss/nss.vs2015.patch @@ -10,3 +10,13 @@ diff -ru nss.org/nss/coreconf/WIN32.mk nss/nss/coreconf/WIN32.mk ifeq ($(_MSC_VER_GE_12),1) OS_CFLAGS += -FS endif +--- a/nss/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc 2018-08-08 11:08:42.922939267 +0200 ++++ b/nss/nss/gtests/nss_bogo_shim/nss_bogo_shim.cc 2018-08-08 11:08:47.778929835 +0200 +@@ -6,6 +6,7 @@ + #include "config.h" + + #include <algorithm> ++#include <iterator> + #include <cstdlib> + #include <iostream> + #include <memory> |