diff options
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch | 36 | ||||
-rw-r--r-- | meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch | 46 | ||||
-rw-r--r-- | meta-oe/recipes-support/nss/nss_3.57.bb (renamed from meta-oe/recipes-support/nss/nss_3.56.bb) | 3 |
3 files changed, 24 insertions, 61 deletions
diff --git a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch index bfc375e83a..65e1500ae5 100644 --- a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch +++ b/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch @@ -10,22 +10,24 @@ Upstream-Status: Pending Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- - nss/lib/freebl/Makefile | 4 ++++ + nss/lib/freebl/Makefile | 3 +++ nss/lib/freebl/gcm.c | 2 ++ - 2 files changed, 6 insertions(+) + 2 files changed, 5 insertions(+) +diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile +index fe8c526..922f67c 100644 --- a/nss/lib/freebl/Makefile +++ b/nss/lib/freebl/Makefile -@@ -126,6 +126,8 @@ else +@@ -125,6 +125,8 @@ else + DEFINES += -DNSS_X86 endif endif - ifdef NS_USE_GCC +ifdef NSS_USE_ARM_HW_CRYPTO + DEFINES += -DNSS_USE_ARM_HW_CRYPTO ifeq ($(CPU_ARCH),aarch64) - DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha1-armv8.c sha256-armv8.c -@@ -150,6 +152,7 @@ endif + ifdef CC_IS_CLANG + DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 +@@ -166,6 +168,7 @@ endif endif endif endif @@ -33,15 +35,23 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ifeq ($(OS_TARGET),OSF1) DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD +diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c +index c2cc18d..b77f573 100644 --- a/nss/lib/freebl/gcm.c +++ b/nss/lib/freebl/gcm.c -@@ -21,7 +21,9 @@ +@@ -18,6 +18,7 @@ + + #include <limits.h> + ++#ifdef NSS_USE_ARM_HW_CRYPTO /* old gcc doesn't support some poly64x2_t intrinsic */ #if defined(__aarch64__) && defined(IS_LITTLE_ENDIAN) && \ (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6) -+# ifdef NSS_USE_ARM_HW_CRYPTO - #define USE_ARM_GCM -+# endif - #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \ - !defined(NSS_DISABLE_ARM32_NEON) +@@ -27,6 +28,7 @@ /* We don't test on big endian platform, so disable this on big endian. */ + #define USE_ARM_GCM + #endif ++#endif + + /* Forward declarations */ + SECStatus gcm_HashInit_hw(gcmHashContext *ghash); diff --git a/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch b/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch deleted file mode 100644 index 432312da25..0000000000 --- a/meta-oe/recipes-support/nss/nss/0001-pkix-Do-not-use-NULL-where-0-is-needed.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1136cad77c2dc7d8e1daa317877676733e805f29 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 26 Aug 2020 17:30:40 -0700 -Subject: [PATCH] pkix: Do not use NULL where 0 is needed - -Clang finds this error - -pkix_logger.c:316:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast] - logger->logComponent = (PKIX_ERRORCLASS)NULL; - ^~~~~~~~~~~~~~~~~~~~~ -pkix_logger.c:617:32: error: cast to smaller integer type 'PKIX_ERRORCLASS' from 'void *' [-Werror,-Wvoid-pointer-to-enum-cast] - logger->logComponent = (PKIX_ERRORCLASS)NULL; - ^~~~~~~~~~~~~~~~~~~~~ -2 errors generated. - -Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1661378] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - nss/lib/libpkix/pkix/util/pkix_logger.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/nss/lib/libpkix/pkix/util/pkix_logger.c b/nss/lib/libpkix/pkix/util/pkix_logger.c -index a916e6e..10f537a 100644 ---- a/nss/lib/libpkix/pkix/util/pkix_logger.c -+++ b/nss/lib/libpkix/pkix/util/pkix_logger.c -@@ -313,7 +313,7 @@ pkix_Logger_Destroy( - - logger->callback = NULL; - PKIX_DECREF(logger->context); -- logger->logComponent = (PKIX_ERRORCLASS)NULL; -+ logger->logComponent = (PKIX_ERRORCLASS)0; - - cleanup: - -@@ -614,7 +614,7 @@ PKIX_Logger_Create( - - logger->callback = callback; - logger->maxLevel = 0; -- logger->logComponent = (PKIX_ERRORCLASS)NULL; -+ logger->logComponent = (PKIX_ERRORCLASS)0; - - PKIX_INCREF(loggerContext); - logger->context = loggerContext; --- -2.28.0 - diff --git a/meta-oe/recipes-support/nss/nss_3.56.bb b/meta-oe/recipes-support/nss/nss_3.57.bb index 997f8950fd..5d9318a922 100644 --- a/meta-oe/recipes-support/nss/nss_3.56.bb +++ b/meta-oe/recipes-support/nss/nss_3.57.bb @@ -31,9 +31,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO file://system-pkcs11.txt \ file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ - file://0001-pkix-Do-not-use-NULL-where-0-is-needed.patch \ " -SRC_URI[sha256sum] = "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c" +SRC_URI[sha256sum] = "55a86c01be860381d64bb4e5b94eb198df9b0f098a8af0e58c014df398bdc382" UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" |