On Mon, Sep 16, 2019 at 8:05 AM Adrian Bunk <[email protected]> wrote: > > Backported patches removed. > > Signed-off-by: Adrian Bunk <[email protected]> > --- > .../0001-Fix-broken-change-from-b3d113e.patch | 35 --------------- > ...x-build-error-for-aarch64-big-endian.patch | 43 ------------------- > .../{openssl_1.1.1c.bb => openssl_1.1.1d.bb} | 6 +-- > 3 files changed, 2 insertions(+), 82 deletions(-) > delete mode 100644 > meta/recipes-connectivity/openssl/openssl/0001-Fix-broken-change-from-b3d113e.patch > delete mode 100644 > meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch > rename meta/recipes-connectivity/openssl/{openssl_1.1.1c.bb => > openssl_1.1.1d.bb} (96%) > > diff --git > a/meta/recipes-connectivity/openssl/openssl/0001-Fix-broken-change-from-b3d113e.patch > > b/meta/recipes-connectivity/openssl/openssl/0001-Fix-broken-change-from-b3d113e.patch > deleted file mode 100644 > index 6b4789fc70..0000000000 > --- > a/meta/recipes-connectivity/openssl/openssl/0001-Fix-broken-change-from-b3d113e.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From 711a161f03ef9ed7cd149a22bf1203700c103e96 Mon Sep 17 00:00:00 2001 > -From: Pauli <[email protected]> > -Date: Fri, 29 Mar 2019 09:24:07 +1000 > -Subject: [PATCH] Fix broken change from b3d113e. > - > -Reviewed-by: Tim Hudson <[email protected]> > -(Merged from https://github.com/openssl/openssl/pull/8606) > - > -Running valgrind against code using Openssl v1.1.1c reports a large number of > -uninitialized memory errors. This fix from upstream solves this problem. > - > -Upstream-Status: Backport > [https://github.com/openssl/openssl/commit/711a161f03ef9ed7cd149a22bf1203700c103e96] > -Signed-off-by: Laurent Bonnans <[email protected]> > ---- > - crypto/rand/rand_lib.c | 3 ++- > - 1 file changed, 2 insertions(+), 1 deletion(-) > - > -diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c > -index 23abbde156..a298b7515b 100644 > ---- a/crypto/rand/rand_lib.c > -+++ b/crypto/rand/rand_lib.c > -@@ -235,8 +235,9 @@ size_t rand_drbg_get_nonce(RAND_DRBG *drbg, > - struct { > - void * instance; > - int count; > -- } data = { NULL, 0 }; > -+ } data; > - > -+ memset(&data, 0, sizeof(data)); > - pool = rand_pool_new(0, min_len, max_len); > - if (pool == NULL) > - return 0; > --- > -2.20.1 > - > diff --git > a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch > > b/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch > deleted file mode 100644 > index 9a90a68cfd..0000000000 > --- > a/meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch > +++ /dev/null > @@ -1,43 +0,0 @@ > -From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001 > -From: Lei Maohui <[email protected]> > -Date: Thu, 13 Jun 2019 12:17:30 +0900 > -Subject: [PATCH] Fix build error for aarch64 big endian. > - > -Modified rev to rev64, because rev only takes integer registers. > -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827 > -Otherwise, the following error will occur. > - > -Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b' > - > -Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/9151] > - > -Signed-off-by: Lei Maohui <[email protected]> > ---- > - crypto/sha/asm/keccak1600-armv8.pl | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > - > -diff --git a/crypto/sha/asm/keccak1600-armv8.pl > b/crypto/sha/asm/keccak1600-armv8.pl > -index dc72f18..6620690 100755 > ---- a/crypto/sha/asm/keccak1600-armv8.pl > -+++ b/crypto/sha/asm/keccak1600-armv8.pl > -@@ -731,7 +731,7 @@ $code.=<<___; > - blo .Lprocess_block_ce > - ldr d31,[$inp],#8 // *inp++ > - #ifdef __AARCH64EB__ > -- rev v31.16b,v31.16b > -+ rev64 v31.16b,v31.16b > - #endif > - eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b > - beq .Lprocess_block_ce > -@@ -740,7 +740,7 @@ ___ > - $code.=<<___; > - ldr d31,[$inp],#8 // *inp++ > - #ifdef __AARCH64EB__ > -- rev v31.16b,v31.16b > -+ rev64 v31.16b,v31.16b > - #endif > - eor $A[4][4],$A[4][4],v31.16b > - > --- > -2.7.4 > - > diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb > b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb > similarity index 96% > rename from meta/recipes-connectivity/openssl/openssl_1.1.1c.bb > rename to meta/recipes-connectivity/openssl/openssl_1.1.1d.bb > index 75159ac725..080d1a8bb7 100644 > --- a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb > +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb > @@ -16,16 +16,14 @@ SRC_URI = > "http://www.openssl.org/source/openssl-${PV}.tar.gz \ > file://0001-skip-test_symbol_presence.patch \ > > file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ > file://afalg.patch \ > - file://0001-Fix-build-error-for-aarch64-big-endian.patch \ > - file://0001-Fix-broken-change-from-b3d113e.patch \ > " > > SRC_URI_append_class-nativesdk = " \ > file://environment.d-openssl.sh \ > " > > -SRC_URI[md5sum] = "15e21da6efe8aa0e0768ffd8cd37a5f6" > -SRC_URI[sha256sum] = > "f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90" > +SRC_URI[md5sum] = "3be209000dbc7e1b95bcdf47980a3baa" > +SRC_URI[sha256sum] = > "1e3a91bc1f9dfce01af26026f856e064eab4c8ee0a8f457b5ae30b40b8b711f2" > > inherit lib_package multilib_header multilib_script ptest > MULTILIB_SCRIPTS = "${PN}-bin:${bindir}/c_rehash"
Seems like this has broken FIT image signing: | Could not obtain signature: error:2406C06E:random number generator:RAND_DRBG_instantiate:error retrieving entropy | uboot-mkimage Can't add hashes to FIT blob: -1 | Failed to sign 'signature@1' signature node in '[email protected]' conf node Not dug into it yet, but reverting this fixes it. -- Alex Kiernan -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
