On 8/27/20 7:04 PM, Khem Raj wrote:
> Forward port 0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
>
> Signed-off-by: Khem Raj <[email protected]>
> ---
> v2: Update armv8 hw crypto patch to work on arm32
Did you add this to an image?
I am seeing new error when nss is appended to an image.
WARNING: security-build-image-1.0-r0 do_rootfs: nss.postinst returned 127,
marking as unpacked only, configuration required on target.
2020-08-28 02:07:33 - ERROR - ERROR: security-build-image-1.0-r0 do_rootfs:
Postinstall scriptlets of ['nss'] have failed. If the intention is to defer
them to first boot,
2020-08-28 02:07:33 - ERROR - then please place them into
pkg_postinst_ontarget_${PN} ().
2020-08-28 02:07:33 - ERROR - Deferring to first boot via 'exit 1' is no
longer supported.
- Armin
>
> ...figure-option-to-disable-ARM-HW-cryp.patch | 32 ++++++-------------
> .../nss/{nss_3.54.bb => nss_3.56.bb} | 3 +-
> 2 files changed, 11 insertions(+), 24 deletions(-)
> rename meta-oe/recipes-support/nss/{nss_3.54.bb => nss_3.56.bb} (99%)
>
> 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 1a87a0577f..f1f76bd1b7 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
> @@ -14,21 +14,18 @@ Signed-off-by: Alexander Kanavin <[email protected]>
> nss/lib/freebl/gcm.c | 2 ++
> 2 files changed, 6 insertions(+)
>
> -diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
> -index f99f769..b0ec81b 100644
> --- a/nss/lib/freebl/Makefile
> +++ b/nss/lib/freebl/Makefile
> -@@ -125,6 +125,9 @@ else
> - DEFINES += -DNSS_X86
> +@@ -126,6 +126,8 @@ else
> 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_SHA2
> - EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
> -@@ -148,6 +151,7 @@ endif
> + 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
> endif
> endif
> endif
> @@ -36,23 +33,14 @@ index f99f769..b0ec81b 100644
>
> 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
> -@@ -18,6 +18,7 @@
> +@@ -20,7 +20,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)
> -@@ -27,6 +28,7 @@
> - /* We don't test on big endian platform, so disable this on big endian. */
> +- (defined(__clang__) || defined(__GNUC__) && __GNUC__ > 6)
> ++ (defined(__clang__) && defined(NSS_USE_ARM_HW_CRYPTO) ||
> defined(__GNUC__) && __GNUC__ > 6)
> #define USE_ARM_GCM
> - #endif
> -+#endif
> -
> - /* Forward declarations */
> - SECStatus gcm_HashInit_hw(gcmHashContext *ghash);
> + #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \
> + !defined(NSS_DISABLE_ARM32_NEON)
> diff --git a/meta-oe/recipes-support/nss/nss_3.54.bb
> b/meta-oe/recipes-support/nss/nss_3.56.bb
> similarity index 99%
> rename from meta-oe/recipes-support/nss/nss_3.54.bb
> rename to meta-oe/recipes-support/nss/nss_3.56.bb
> index 1cc94735bb..4aa5d29ec2 100644
> --- a/meta-oe/recipes-support/nss/nss_3.54.bb
> +++ b/meta-oe/recipes-support/nss/nss_3.56.bb
> @@ -34,8 +34,7 @@ SRC_URI =
> "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${VERSIO
>
> 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] =
> "dab18bbfcf5e347934cda664df75ce9fd912a5772686c40d3c805e53c08d6e43"
> +SRC_URI[sha256sum] =
> "f875e0e8ed3b5ce92d675be4a55aa25a8c1199789a4a01f69b5f2327e2048e9c"
>
> UPSTREAM_CHECK_URI =
> "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases";
> UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes"
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#86675):
https://lists.openembedded.org/g/openembedded-devel/message/86675
Mute This Topic: https://lists.openembedded.org/mt/76465987/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
