summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/nss
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/nss')
-rw-r--r--meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch11
-rw-r--r--meta-oe/recipes-support/nss/nss_3.108.bb (renamed from meta-oe/recipes-support/nss/nss_3.107.bb)2
2 files changed, 5 insertions, 8 deletions
diff --git a/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
index 5debd13488..63f822be25 100644
--- a/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
+++ b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
@@ -1,4 +1,4 @@
1From 781a21fa9b0d8d8d6df0de45e3c9dc3f3e74be8f Mon Sep 17 00:00:00 2001 1From 459ee39104228a958a0999e1a7d4c43e4e6fe4f0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 18 Dec 2019 12:29:50 +0100 3Date: Wed, 18 Dec 2019 12:29:50 +0100
4Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto 4Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto
@@ -36,7 +36,7 @@ index 0ebfc92..3ee7623 100644
36 ifeq (,$(filter-out WINNT,$(OS_TARGET))) 36 ifeq (,$(filter-out WINNT,$(OS_TARGET)))
37 ifndef USE_64 37 ifndef USE_64
38diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c 38diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
39index d728867..8b4de1d 100644 39index a2f63a6..743158e 100644
40--- a/nss/lib/freebl/gcm.c 40--- a/nss/lib/freebl/gcm.c
41+++ b/nss/lib/freebl/gcm.c 41+++ b/nss/lib/freebl/gcm.c
42@@ -18,6 +18,7 @@ 42@@ -18,6 +18,7 @@
@@ -53,8 +53,5 @@ index d728867..8b4de1d 100644
53 #endif 53 #endif
54+#endif 54+#endif
55 55
56 /* Forward declarations */ 56 #if defined(__ARM_NEON) || defined(__ARM_NEON__)
57 SECStatus gcm_HashInit_hw(gcmHashContext *ghash); 57 #include <arm_neon.h>
58--
592.25.1
60
diff --git a/meta-oe/recipes-support/nss/nss_3.107.bb b/meta-oe/recipes-support/nss/nss_3.108.bb
index 23e046b0a9..0c42f40bb0 100644
--- a/meta-oe/recipes-support/nss/nss_3.107.bb
+++ b/meta-oe/recipes-support/nss/nss_3.108.bb
@@ -33,7 +33,7 @@ SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/$
33 file://0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch \ 33 file://0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch \
34 file://0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ 34 file://0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
35 " 35 "
36SRC_URI[sha256sum] = "7f7e96473e38150771a615f5d40e8c41ba3a19385301ae0c525091f2fc9d6729" 36SRC_URI[sha256sum] = "a0f6fcb5dbadc1635b43827517a979e3a6d005d0788527802a6b31e2c5f66eec"
37 37
38UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/" 38UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/"
39UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)" 39UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)"