mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
nss: update to 3.49.1
Drop a backport, and a patch that causes build errors with the new version. Add a patch to make ARM HW crypto optional; upstream for some reason does not allow disabling it. (From OE-Core rev: 73a1536a7e2fd5dad7d6855ac5e94f87890a1b95) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
committed by
Richard Purdie
Richard Purdie
parent
962e7e9bc4
commit
2de469f312
-35
@@ -1,35 +0,0 @@
|
||||
From 6b351dbb049b3b3ab6c0d51aa3c1c7fb3c9df80c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||
Date: Mon, 22 Jul 2019 11:07:41 -0700
|
||||
Subject: [PATCH] Bug 1493916 - Fix ppc64 inline assembler for clang r=jcj
|
||||
Seems clang's inline assembler doesn't want registers to be prefixed with
|
||||
"r", while gcc accepts both - r0 and 0 for GPR0.
|
||||
|
||||
tested with clang 6.0 and gcc 8.1
|
||||
|
||||
--HG--
|
||||
extra : amend_source : 87e09bb59c78bdb25b9573b9f29511e10b9db6fa
|
||||
extra : histedit_source : 9b3fad70ac2851bf7de14d42c34db4a5fba41710
|
||||
|
||||
Upstream-Status: Backport [https://github.com/nss-dev/nss/commit/671d89b6c4a6f41707bb044534751098e2e3f211]
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
nss/lib/freebl/mpi/mpcpucache.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/nss/lib/freebl/mpi/mpcpucache.c b/nss/lib/freebl/mpi/mpcpucache.c
|
||||
index 336b4cc..2ad291f 100644
|
||||
--- a/nss/lib/freebl/mpi/mpcpucache.c
|
||||
+++ b/nss/lib/freebl/mpi/mpcpucache.c
|
||||
@@ -727,7 +727,7 @@ static inline void
|
||||
dcbzl(char *array)
|
||||
{
|
||||
register char *a asm("r2") = array;
|
||||
- __asm__ __volatile__("dcbzl %0,r0"
|
||||
+ __asm__ __volatile__("dcbzl %0,0"
|
||||
: "=r"(a)
|
||||
: "0"(a));
|
||||
}
|
||||
--
|
||||
2.24.0
|
||||
|
||||
+35
@@ -0,0 +1,35 @@
|
||||
From 5595e9651aca39af945931c73eb524a0f8bd130d Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Wed, 18 Dec 2019 12:29:50 +0100
|
||||
Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto
|
||||
|
||||
Not all current hardware supports it, particularly anything
|
||||
prior to armv8 does not.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
nss/lib/freebl/Makefile | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
|
||||
index 06506f0..a8b015d 100644
|
||||
--- a/nss/lib/freebl/Makefile
|
||||
+++ b/nss/lib/freebl/Makefile
|
||||
@@ -125,6 +125,8 @@ else
|
||||
DEFINES += -DNSS_X86
|
||||
endif
|
||||
endif
|
||||
+
|
||||
+ifdef NSS_USE_ARM_HW_CRYPTO
|
||||
ifeq ($(CPU_ARCH),aarch64)
|
||||
DEFINES += -DUSE_HW_AES
|
||||
EXTRA_SRCS += aes-armv8.c gcm-aarch64.c
|
||||
@@ -145,6 +147,7 @@ ifeq ($(CPU_ARCH),arm)
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
+endif
|
||||
|
||||
ifeq ($(OS_TARGET),OSF1)
|
||||
DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD
|
||||
@@ -29,7 +29,7 @@ Index: nss-3.24/nss/coreconf/nsinstall/Makefile
|
||||
+# to clean the '-m64' from ARCHFLAG and LDFLAGS.
|
||||
+ARCHFLAG =
|
||||
+LDFLAGS =
|
||||
+CFLAGS =
|
||||
+# CFLAGS =
|
||||
+
|
||||
ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET)))
|
||||
PROGRAM =
|
||||
|
||||
@@ -25,17 +25,17 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
|
||||
file://0001-nss-fix-support-cross-compiling.patch \
|
||||
file://nss-no-rpath-for-cross-compiling.patch \
|
||||
file://nss-fix-incorrect-shebang-of-perl.patch \
|
||||
file://nss-fix-nsinstall-build.patch \
|
||||
file://disable-Wvarargs-with-clang.patch \
|
||||
file://pqg.c-ULL_addend.patch \
|
||||
file://0001-Bug-1493916-Fix-ppc64-inline-assembler-for-clang-r-j.patch \
|
||||
file://blank-cert9.db \
|
||||
file://blank-key4.db \
|
||||
file://system-pkcs11.txt \
|
||||
file://nss-fix-nsinstall-build.patch \
|
||||
file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "f1752d7223ee9d910d551e57264bafa8"
|
||||
SRC_URI[sha256sum] = "112f05223d1fde902c170966bfc6f011b24a838be16969b110ecf2bb7bc24e8b"
|
||||
SRC_URI[md5sum] = "6b92ac02dcf9e9e44df5390f6814c157"
|
||||
SRC_URI[sha256sum] = "d9aa42e49e02bb0dc0a2f164604cfc718e11a2a06ddb266cd676376ac21b026e"
|
||||
|
||||
UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases"
|
||||
UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
|
||||
@@ -69,7 +69,8 @@ do_compile_prepend_class-native() {
|
||||
do_compile() {
|
||||
export CROSS_COMPILE=1
|
||||
export NATIVE_CC="${BUILD_CC}"
|
||||
export NATIVE_FLAGS="${BUILD_CFLAGS}"
|
||||
# Additional defines needed on Centos 7
|
||||
export NATIVE_FLAGS="${BUILD_CFLAGS} -DLINUX -Dlinux"
|
||||
export BUILD_OPT=1
|
||||
|
||||
export FREEBL_NO_DEPEND=1
|
||||
@@ -81,6 +82,8 @@ do_compile() {
|
||||
export NSS_USE_SYSTEM_SQLITE=1
|
||||
export NSS_ENABLE_ECC=1
|
||||
|
||||
${@bb.utils.contains("TUNE_FEATURES", "crypto", "export NSS_USE_ARM_HW_CRYPTO=1", "", d)}
|
||||
|
||||
export OS_RELEASE=3.4
|
||||
export OS_TARGET=Linux
|
||||
export OS_ARCH=Linux
|
||||
Reference in New Issue
Block a user