summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl/openssl
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-09-16 10:05:15 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-09-16 23:02:45 +0100
commit2c6b9b918cd0baecfbf3fd1844a82fa017a9b844 (patch)
tree9a6c516826cf692ae929b73b81ce8d1229a7d37c /meta/recipes-connectivity/openssl/openssl
parentda61ee554134f5d56f2deaf42ea0d20d84e36b83 (diff)
downloadpoky-2c6b9b918cd0baecfbf3fd1844a82fa017a9b844.tar.gz
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>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-Fix-broken-change-from-b3d113e.patch35
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-Fix-build-error-for-aarch64-big-endian.patch43
2 files changed, 0 insertions, 78 deletions
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 @@
1From 711a161f03ef9ed7cd149a22bf1203700c103e96 Mon Sep 17 00:00:00 2001
2From: Pauli <paul.dale@oracle.com>
3Date: Fri, 29 Mar 2019 09:24:07 +1000
4Subject: [PATCH] Fix broken change from b3d113e.
5
6Reviewed-by: Tim Hudson <tjh@openssl.org>
7(Merged from https://github.com/openssl/openssl/pull/8606)
8
9Running valgrind against code using Openssl v1.1.1c reports a large number of
10uninitialized memory errors. This fix from upstream solves this problem.
11
12Upstream-Status: Backport [https://github.com/openssl/openssl/commit/711a161f03ef9ed7cd149a22bf1203700c103e96]
13Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
14---
15 crypto/rand/rand_lib.c | 3 ++-
16 1 file changed, 2 insertions(+), 1 deletion(-)
17
18diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
19index 23abbde156..a298b7515b 100644
20--- a/crypto/rand/rand_lib.c
21+++ b/crypto/rand/rand_lib.c
22@@ -235,8 +235,9 @@ size_t rand_drbg_get_nonce(RAND_DRBG *drbg,
23 struct {
24 void * instance;
25 int count;
26- } data = { NULL, 0 };
27+ } data;
28
29+ memset(&data, 0, sizeof(data));
30 pool = rand_pool_new(0, min_len, max_len);
31 if (pool == NULL)
32 return 0;
33--
342.20.1
35
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 @@
1From 1f8c0f2feea5cdcae0bcd9dfc78198d9e2c4cf09 Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com>
3Date: Thu, 13 Jun 2019 12:17:30 +0900
4Subject: [PATCH] Fix build error for aarch64 big endian.
5
6Modified rev to rev64, because rev only takes integer registers.
7https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90827
8Otherwise, the following error will occur.
9
10Error: operand 1 must be an integer register -- `rev v31.16b,v31.16b'
11
12Upstream-Status: Submitted [https://github.com/openssl/openssl/pull/9151]
13
14Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
15---
16 crypto/sha/asm/keccak1600-armv8.pl | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/crypto/sha/asm/keccak1600-armv8.pl b/crypto/sha/asm/keccak1600-armv8.pl
20index dc72f18..6620690 100755
21--- a/crypto/sha/asm/keccak1600-armv8.pl
22+++ b/crypto/sha/asm/keccak1600-armv8.pl
23@@ -731,7 +731,7 @@ $code.=<<___;
24 blo .Lprocess_block_ce
25 ldr d31,[$inp],#8 // *inp++
26 #ifdef __AARCH64EB__
27- rev v31.16b,v31.16b
28+ rev64 v31.16b,v31.16b
29 #endif
30 eor $A[$j/5][$j%5],$A[$j/5][$j%5],v31.16b
31 beq .Lprocess_block_ce
32@@ -740,7 +740,7 @@ ___
33 $code.=<<___;
34 ldr d31,[$inp],#8 // *inp++
35 #ifdef __AARCH64EB__
36- rev v31.16b,v31.16b
37+ rev64 v31.16b,v31.16b
38 #endif
39 eor $A[4][4],$A[4][4],v31.16b
40
41--
422.7.4
43