diff options
| author |   Armin Kuster <akuster@mvista.com> | 2018-03-26 07:30:08 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-03-29 09:51:38 +0100 |
| commit | d136548ad7aef23021eac6af2ffc6317f36bd1c5 (patch) | |
| tree | a63b0a63423b4255c19732d4441f9104cc4c7d43 | |
| parent | 94fea92f5e7f7c0765e89743a1586b22186a16cd (diff) | |
| download | openembedded-core-contrib-d136548ad7aef23021eac6af2ffc6317f36bd1c5.tar.gz | |
nss: update to 3.35
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch | 30 | ||||
| -rw-r--r-- | meta/recipes-support/nss/nss_3.35.bb (renamed from meta/recipes-support/nss/nss_3.34.1.bb) | 5 |
2 files changed, 33 insertions, 2 deletions
diff --git a/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch b/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch new file mode 100644 index 0000000000..8276f89e8b --- /dev/null +++ b/meta/recipes-support/nss/nss/nss-build-hacl-poly1305-aarch64.patch @@ -0,0 +1,30 @@ +# HG changeset patch +# User Daiki Ueno <dueno@redhat.com> +# Date 1516710574 -3600 +# Tue Jan 23 13:29:34 2018 +0100 +# Node ID 27f27ce21c2c6ff5a47fa9e17c438b000366c9c9 +# Parent be1dca5ac80541d3b81a8da9d42854d8b1cceefb +Build Hacl_Poly1305_64.o on aarch64 even with make + +Upstream-Status: Backport +https://bug1432455.bmoattachments.org/attachment.cgi?id=8944691 +Signed-off-by: Armin Kuster <akuster@mvista.com> + +Index: nss-3.35/nss/lib/freebl/Makefile +=================================================================== +--- nss-3.35.orig/nss/lib/freebl/Makefile ++++ nss-3.35/nss/lib/freebl/Makefile +@@ -533,7 +533,12 @@ ifndef NSS_DISABLE_CHACHAPOLY + EXTRA_SRCS += chacha20_vec.c + endif + else +- EXTRA_SRCS += poly1305.c ++ ifeq ($(CPU_ARCH),aarch64) ++ EXTRA_SRCS += Hacl_Poly1305_64.c ++ else ++ EXTRA_SRCS += poly1305.c ++ endif ++ + EXTRA_SRCS += chacha20.c + VERIFIED_SRCS += Hacl_Chacha20.c + endif # x86_64 diff --git a/meta/recipes-support/nss/nss_3.34.1.bb b/meta/recipes-support/nss/nss_3.35.bb index ae52a95a30..08e3a06fad 100644 --- a/meta/recipes-support/nss/nss_3.34.1.bb +++ b/meta/recipes-support/nss/nss_3.35.bb @@ -26,10 +26,11 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://disable-Wvarargs-with-clang.patch \ file://pqg.c-ULL_addend.patch \ file://Fix-compilation-for-X32.patch \ + file://nss-build-hacl-poly1305-aarch64.patch \ " -SRC_URI[md5sum] = "5922468bb1c54e4c8067f153fcf467e5" -SRC_URI[sha256sum] = "a3c15d367caf784f33d96dbafbdffc16a8e42fb8c8aedfce97bf92a9f918dda0" +SRC_URI[md5sum] = "9467ec9e65c5aeb3254a50250490f5f7" +SRC_URI[sha256sum] = "f4127de09bede39f5fd0f789d33c3504c5d261e69ea03022d46b319b3e32f6fa" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" |