mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
openssl: Upgrade 1.1.1c -> 1.1.1d
Backported patches removed. (From OE-Core rev: 24174c6dafefec4ff3bd79b3c871b17cbfa3e840) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
da61ee5541
commit
2c6b9b918c
@@ -1,35 +0,0 @@
|
||||
From 711a161f03ef9ed7cd149a22bf1203700c103e96 Mon Sep 17 00:00:00 2001
|
||||
From: Pauli <paul.dale@oracle.com>
|
||||
Date: Fri, 29 Mar 2019 09:24:07 +1000
|
||||
Subject: [PATCH] Fix broken change from b3d113e.
|
||||
|
||||
Reviewed-by: Tim Hudson <tjh@openssl.org>
|
||||
(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 <laurent.bonnans@here.com>
|
||||
---
|
||||
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
|
||||
|
||||
-43
@@ -1,43 +0,0 @@
|
||||
From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001
|
||||
From: Lei Maohui <leimaohui@cn.fujitsu.com>
|
||||
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 <leimaohui@cn.fujitsu.com>
|
||||
---
|
||||
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
|
||||
|
||||
+2
-4
@@ -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"
|
||||
Reference in New Issue
Block a user