From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by mx.groups.io with SMTP id smtpd.web10.47572.1598634223387261927 for ; Fri, 28 Aug 2020 10:03:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20161025 header.b=OoYhZpWa; spf=pass (domain: gmail.com, ip: 209.85.216.67, mailfrom: raj.khem@gmail.com) Received: by mail-pj1-f67.google.com with SMTP id q93so30212pjq.0 for ; Fri, 28 Aug 2020 10:03:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=eIsBhkcCH7PsRvw69CWIsmOdlHvTc+vKwrmnhaWEbbM=; b=OoYhZpWaet7sDozWu9/sTVJ9uRYRRQUNb1kN0CFjOITRCLbJYxYOlTqYUJ/YqJ6ji5 SmFKKQxP2qME0kjYSQeGLrA9y+9PwNN7JQZIiNKzD23wSKcy4hlBd1hUHCRPadWrVkyq mPrKJ5tJ5BGJ8I5OGK5Ho+DcAaITIm7/pGK71lg9tjRzPDbb8NRuR31gBo9OwFNe886n CDRjUPWOAk45ZMGXV0oZhSAq+IJJUfeMgAZ9fdC8Z8thzdQnhMWfAME4k5Pgfi1JNRSh csVGZc2qPUsk/PJehdCGPBqetpiYilw0dTIPjpWiG/u2FVqgCpfoVHbosC6S9TgBYdbA eO/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=eIsBhkcCH7PsRvw69CWIsmOdlHvTc+vKwrmnhaWEbbM=; b=CxQ5bK7WFxUngHkKNz0kMCwTc2/r+92851SnOK82tpXIddOGqRoyD2IlnmAQPX/nWS 8Z5hYiKf8+lJ0jjER1P97up1sjPPuHjuFAbwhRitgRY7zGeLxB4NRJGkmIa6GBIdjUIw ARAGdsjmBvQJNDhs5c2MyZ8at9j7ufsKi+krD+0zuRoOLBus445Or1iD7FWNJlJLgwdU qsGPOFnM/J83jBezYecWgwUy5FpzUW3EbFmL+w35krNCJumO0816a3CelmJ9F5h5CM/d 20inNZINYOb48PdMjZvvkKZQ+1MrICqu/pAbR3deG1jp5/jlRHNC5cETjPwmkYgIL+xB 1TkA== X-Gm-Message-State: AOAM5332EtYGPFEuBChIVfeoIgixoDCVRrWVkc2O7W3irElcN47zgtrK tLTwrldHvkLcG1ZIPWO4l+A= X-Google-Smtp-Source: ABdhPJzpI+lBnS3kJE/fNcA7ucG31Fua+SnuB/65aujXK3jOyOwQ0s64xgtH/UmN59Sbl6ortiqyXA== X-Received: by 2002:a17:90a:e64b:: with SMTP id ep11mr32677pjb.10.1598634222606; Fri, 28 Aug 2020 10:03:42 -0700 (PDT) Return-Path: Received: from ?IPv6:2601:646:9200:4e0:f1d8:9f31:ff5f:5356? ([2601:646:9200:4e0:f1d8:9f31:ff5f:5356]) by smtp.gmail.com with ESMTPSA id js19sm20518pjb.33.2020.08.28.10.03.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 28 Aug 2020 10:03:41 -0700 (PDT) Subject: Re: [oe] [meta-oe][PATCH v2] nss: Upgrade to 3.56 To: Martin Jansa , akuster Cc: openembedded-devel , Mikko Rapeli References: <20200828020411.1988431-1-raj.khem@gmail.com> From: "Khem Raj" Message-ID: <1460d060-bcec-4e42-d34a-0d3d336e96ef@gmail.com> Date: Fri, 28 Aug 2020 10:03:39 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 8bit On 8/28/20 8:14 AM, Martin Jansa wrote: > I'm seeing this postinst issue already without Khem's nss changes, I > guess it is caused by: > 31552510b1 nss: fix postinst script for nativesdk build > seems so. Although my upgrade patch had compile issues during build which are fixed now. perhaps we should revert 31552510b1 unless there is a better fix Mikko any ideas ? > On Fri, Aug 28, 2020 at 4:43 PM akuster > wrote: > > > > 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 > > > --- > > 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 > > > >   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 > > - > > -+#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.+)_release_notes" > > > > > > >