summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorBonnans, Laurent <laurent.bonnans@here.com>2019-07-19 14:27:48 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-22 17:31:03 +0100
commitffcf23f5f27fd20eabd5a10f3861f7a18c34158c (patch)
treeaf8aeb2af7923f3fadbb5ccf56598995f7f416ee /meta/recipes-connectivity
parentcedd95e09194ea03194c165b6dffe3fdfae2d30a (diff)
downloadpoky-ffcf23f5f27fd20eabd5a10f3861f7a18c34158c.tar.gz
openssl: fix valgrind errors on v1.1.1c
Running valgrind against code using Openssl v1.1.1c reports a large number of uninitialized memory errors. This fix from upstream solves this problem. (From OE-Core rev: 8081d645353ed934a0158329f2f36ea49d663e19) Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/openssl/openssl/0001-Fix-broken-change-from-b3d113e.patch35
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.1.1c.bb1
2 files changed, 36 insertions, 0 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
new file mode 100644
index 0000000000..6b4789fc70
--- /dev/null
+++ b/meta/recipes-connectivity/openssl/openssl/0001-Fix-broken-change-from-b3d113e.patch
@@ -0,0 +1,35 @@
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_1.1.1c.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb
index 377adb1785..75159ac725 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb
@@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
17 file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ 17 file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \
18 file://afalg.patch \ 18 file://afalg.patch \
19 file://0001-Fix-build-error-for-aarch64-big-endian.patch \ 19 file://0001-Fix-build-error-for-aarch64-big-endian.patch \
20 file://0001-Fix-broken-change-from-b3d113e.patch \
20 " 21 "
21 22
22SRC_URI_append_class-nativesdk = " \ 23SRC_URI_append_class-nativesdk = " \