diff options
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r-- | meta-oe/recipes-support/nss/nss/0001-Bug-1750624-Pin-validation-date-for-PayPalEE-test-ce.patch | 64 | ||||
-rw-r--r-- | meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch | 14 | ||||
-rw-r--r-- | meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch | 14 | ||||
-rw-r--r-- | meta-oe/recipes-support/nss/nss_3.98.bb (renamed from meta-oe/recipes-support/nss/nss_3.74.bb) | 5 |
4 files changed, 16 insertions, 81 deletions
diff --git a/meta-oe/recipes-support/nss/nss/0001-Bug-1750624-Pin-validation-date-for-PayPalEE-test-ce.patch b/meta-oe/recipes-support/nss/nss/0001-Bug-1750624-Pin-validation-date-for-PayPalEE-test-ce.patch deleted file mode 100644 index d905bf10e..000000000 --- a/meta-oe/recipes-support/nss/nss/0001-Bug-1750624-Pin-validation-date-for-PayPalEE-test-ce.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From 1109c1b8259ad840ac1688d533f76ca268c67b6b Mon Sep 17 00:00:00 2001 | ||
2 | From: "John M. Schanck" <jschanck@mozilla.com> | ||
3 | Date: Sat, 5 Feb 2022 11:12:43 +0000 | ||
4 | Subject: [PATCH] Bug 1750624 - Pin validation date for PayPalEE test cert. | ||
5 | r=nss-reviewers,bbeurdouche,rrelyea | ||
6 | |||
7 | Differential Revision: https://phabricator.services.mozilla.com/D136289 | ||
8 | |||
9 | --HG-- | ||
10 | extra : moz-landing-system : lando | ||
11 | |||
12 | Upstream-Status: Backport | ||
13 | |||
14 | --- | ||
15 | tests/chains/chains.sh | 6 +++++- | ||
16 | tests/chains/scenarios/realcerts.cfg | 1 + | ||
17 | 2 files changed, 6 insertions(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/tests/chains/chains.sh b/tests/chains/chains.sh | ||
20 | index 32c7ef54c..e13ae52f9 100755 | ||
21 | --- a/nss/tests/chains/chains.sh | ||
22 | +++ b/nss/tests/chains/chains.sh | ||
23 | @@ -917,7 +917,7 @@ verify_cert() | ||
24 | done | ||
25 | |||
26 | VFY_OPTS_TNAME="${DB_OPT} ${ENGINE} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${TRUST_OPT}" | ||
27 | - VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}" | ||
28 | + VFY_OPTS_ALL="${DB_OPT} ${ENGINE} -vv ${VFY_TIME_OPT} ${TRUST_AND_DB_OPT} ${REV_OPTS} ${FETCH_OPT} ${USAGE_OPT} ${POLICY_OPT} ${VFY_CERTS} ${TRUST_OPT}" | ||
29 | |||
30 | TESTNAME="Verifying certificate(s) ${VFY_LIST} with flags ${VFY_OPTS_TNAME}" | ||
31 | echo "${SCRIPTNAME}: ${TESTNAME}" | ||
32 | @@ -1118,6 +1118,7 @@ parse_config() | ||
33 | ;; | ||
34 | "verify") | ||
35 | VERIFY="${VALUE}" | ||
36 | + VFY_TIME_OPT= | ||
37 | TRUST= | ||
38 | TRUST_AND_DB= | ||
39 | POLICY= | ||
40 | @@ -1126,6 +1127,9 @@ parse_config() | ||
41 | REV_OPTS= | ||
42 | USAGE_OPT= | ||
43 | ;; | ||
44 | + "at_time") | ||
45 | + VFY_TIME_OPT="-b ${VALUE}" | ||
46 | + ;; | ||
47 | "cert") | ||
48 | VERIFY="${VERIFY} ${VALUE}" | ||
49 | ;; | ||
50 | diff --git a/tests/chains/scenarios/realcerts.cfg b/tests/chains/scenarios/realcerts.cfg | ||
51 | index 305443fc3..f8b0fc452 100644 | ||
52 | --- a/nss/tests/chains/scenarios/realcerts.cfg | ||
53 | +++ b/nss/tests/chains/scenarios/realcerts.cfg | ||
54 | @@ -22,6 +22,7 @@ verify TestUser51:x | ||
55 | |||
56 | verify PayPalEE:x | ||
57 | policy OID.2.16.840.1.114412.2.1 | ||
58 | + at_time 2201010000Z | ||
59 | result pass | ||
60 | |||
61 | verify BrAirWaysBadSig:x | ||
62 | -- | ||
63 | 2.25.1 | ||
64 | |||
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 72ee1ee00..b7f1b01a1 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 9937e89c22eb2f2db9a936e7bc4442857b4192f5 Mon Sep 17 00:00:00 2001 | 1 | From 7c8f367faf8848a43a414079189e10270d6c0fcc Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 18 Dec 2019 12:29:50 +0100 | 3 | Date: Wed, 18 Dec 2019 12:29:50 +0100 |
4 | Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto | 4 | Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto |
@@ -15,10 +15,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
15 | 2 files changed, 5 insertions(+) | 15 | 2 files changed, 5 insertions(+) |
16 | 16 | ||
17 | diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile | 17 | diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile |
18 | index b38889f..4616aac 100644 | 18 | index 7ee8736..f9b4925 100644 |
19 | --- a/nss/lib/freebl/Makefile | 19 | --- a/nss/lib/freebl/Makefile |
20 | +++ b/nss/lib/freebl/Makefile | 20 | +++ b/nss/lib/freebl/Makefile |
21 | @@ -139,6 +139,8 @@ endif | 21 | @@ -142,6 +142,8 @@ endif |
22 | endif | 22 | endif |
23 | endif | 23 | endif |
24 | endif | 24 | endif |
@@ -27,16 +27,16 @@ index b38889f..4616aac 100644 | |||
27 | ifeq ($(CPU_ARCH),aarch64) | 27 | ifeq ($(CPU_ARCH),aarch64) |
28 | ifdef CC_IS_CLANG | 28 | ifdef CC_IS_CLANG |
29 | DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 | 29 | DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 |
30 | @@ -180,6 +182,7 @@ endif | 30 | @@ -183,6 +185,7 @@ endif |
31 | endif | 31 | endif |
32 | endif | 32 | endif |
33 | endif | 33 | endif |
34 | +endif | 34 | +endif |
35 | 35 | ||
36 | ifeq ($(OS_TARGET),OSF1) | 36 | ifeq (OS2,$(OS_TARGET)) |
37 | DEFINES += -DMP_ASSEMBLY_MULTIPLY -DMP_NO_MP_WORD | 37 | ASFILES = mpi_x86_os2.s |
38 | diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c | 38 | diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c |
39 | index ac461b4..04cb180 100644 | 39 | index 2dae724..9ee7fc8 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 @@ |
diff --git a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch index 950fae667..2385fd3b9 100644 --- a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch +++ b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 919fc5d674fae99fe21ba1351d98b75e466f425f Mon Sep 17 00:00:00 2001 | 1 | From 46ab1ca6e6fb8e1196e0665a54506dff370f8f2a Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Wed, 22 Feb 2017 11:36:11 +0200 | 3 | Date: Wed, 22 Feb 2017 11:36:11 +0200 |
4 | Subject: [PATCH] nss: fix support cross compiling | 4 | Subject: [PATCH] nss: fix support cross compiling |
@@ -10,15 +10,15 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
11 | 11 | ||
12 | --- | 12 | --- |
13 | nss/coreconf/arch.mk | 2 +- | 13 | nss/coreconf/arch.mk | 4 ++-- |
14 | nss/lib/freebl/Makefile | 6 ++++++ | 14 | nss/lib/freebl/Makefile | 6 ++++++ |
15 | 2 files changed, 7 insertions(+), 1 deletion(-) | 15 | 2 files changed, 8 insertions(+), 2 deletions(-) |
16 | 16 | ||
17 | diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk | 17 | diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk |
18 | index 2012d18..78fca62 100644 | 18 | index 17e9fae..bc4180a 100644 |
19 | --- a/nss/coreconf/arch.mk | 19 | --- a/nss/coreconf/arch.mk |
20 | +++ b/nss/coreconf/arch.mk | 20 | +++ b/nss/coreconf/arch.mk |
21 | @@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s) | 21 | @@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) |
22 | # Attempt to differentiate between sparc and x86 Solaris | 22 | # Attempt to differentiate between sparc and x86 Solaris |
23 | # | 23 | # |
24 | 24 | ||
@@ -31,9 +31,9 @@ index 2012d18..78fca62 100644 | |||
31 | + OS_RELEASE ?= $(shell uname -r) | 31 | + OS_RELEASE ?= $(shell uname -r) |
32 | endif | 32 | endif |
33 | 33 | ||
34 | # | 34 | |
35 | diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile | 35 | diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile |
36 | index 0b8c6f4..b38889f 100644 | 36 | index eeee90a..7ee8736 100644 |
37 | --- a/nss/lib/freebl/Makefile | 37 | --- a/nss/lib/freebl/Makefile |
38 | +++ b/nss/lib/freebl/Makefile | 38 | +++ b/nss/lib/freebl/Makefile |
39 | @@ -36,6 +36,12 @@ ifdef USE_64 | 39 | @@ -36,6 +36,12 @@ ifdef USE_64 |
diff --git a/meta-oe/recipes-support/nss/nss_3.74.bb b/meta-oe/recipes-support/nss/nss_3.98.bb index ea5abe07f..01501362e 100644 --- a/meta-oe/recipes-support/nss/nss_3.74.bb +++ b/meta-oe/recipes-support/nss/nss_3.98.bb | |||
@@ -16,7 +16,7 @@ LICENSE = "(MPL-2.0 & MIT) | (MPL-2.0 & GPL-2.0-or-later & MIT) | (MPL-2.0 & LGP | |||
16 | LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ | 16 | LIC_FILES_CHKSUM = "file://nss/COPYING;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \ |
17 | file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ | 17 | file://nss/lib/freebl/mpi/doc/LICENSE;md5=491f158d09d948466afce85d6f1fe18f \ |
18 | file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132 \ | 18 | file://nss/lib/freebl/mpi/doc/LICENSE-MPL;md5=5d425c8f3157dbf212db2ec53d9e5132 \ |
19 | file://nss/lib/freebl/verified/Hacl_Poly1305_256.c;beginline=1;endline=22;md5=d4096c1e4421ee56e9e0f441a8161f78" | 19 | file://nss/lib/freebl/verified/Hacl_Poly1305_256.c;beginline=1;endline=22;md5=cc22f07b95d28d56baeb757df46ee7c8" |
20 | 20 | ||
21 | VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" | 21 | VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '_RTM'}" |
22 | 22 | ||
@@ -32,9 +32,8 @@ SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/$ | |||
32 | file://system-pkcs11.txt \ | 32 | file://system-pkcs11.txt \ |
33 | file://nss-fix-nsinstall-build.patch \ | 33 | file://nss-fix-nsinstall-build.patch \ |
34 | file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ | 34 | file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ |
35 | file://0001-Bug-1750624-Pin-validation-date-for-PayPalEE-test-ce.patch \ | ||
36 | " | 35 | " |
37 | SRC_URI[sha256sum] = "88928811f9f40f87d42e2eaccdf6e454562e51486067f2ddbe90aa47ea6cd056" | 36 | SRC_URI[sha256sum] = "f549cc33d35c0601674bfacf7c6ad683c187595eb4125b423238d3e9aa4209ce" |
38 | 37 | ||
39 | UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" | 38 | UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" |
40 | UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" | 39 | UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" |