diff options
author | Laurent Bonnans <laurent.bonnans@here.com> | 2019-07-16 17:23:02 +0200 |
---|---|---|
committer | Laurent Bonnans <laurent.bonnans@here.com> | 2019-07-18 16:13:54 +0200 |
commit | 12dbe3116ed539767ca5d283dd558b565e864a2c (patch) | |
tree | 4583cb4a001bfb3dbff7316e1dded571fe3708a0 | |
parent | cb194eef86a50796d1a43c944324ca0ad5b94ab0 (diff) | |
download | meta-updater-12dbe3116ed539767ca5d283dd558b565e864a2c.tar.gz |
Include a valgrind fix for Openssl 1.1.1c
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
-rw-r--r-- | recipes-connectivity/openssl/files/0001-Fix-broken-change-from-b3d113e.patch | 29 | ||||
-rw-r--r-- | recipes-connectivity/openssl/openssl_1.1.1c.bbappend | 4 |
2 files changed, 33 insertions, 0 deletions
diff --git a/recipes-connectivity/openssl/files/0001-Fix-broken-change-from-b3d113e.patch b/recipes-connectivity/openssl/files/0001-Fix-broken-change-from-b3d113e.patch new file mode 100644 index 0000000..b176cc7 --- /dev/null +++ b/recipes-connectivity/openssl/files/0001-Fix-broken-change-from-b3d113e.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 711a161f03ef9ed7cd149a22bf1203700c103e96 Mon Sep 17 00:00:00 2001 | ||
2 | From: Pauli <paul.dale@oracle.com> | ||
3 | Date: Fri, 29 Mar 2019 09:24:07 +1000 | ||
4 | Subject: [PATCH] Fix broken change from b3d113e. | ||
5 | |||
6 | Reviewed-by: Tim Hudson <tjh@openssl.org> | ||
7 | (Merged from https://github.com/openssl/openssl/pull/8606) | ||
8 | --- | ||
9 | crypto/rand/rand_lib.c | 3 ++- | ||
10 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c | ||
13 | index 23abbde156..a298b7515b 100644 | ||
14 | --- a/crypto/rand/rand_lib.c | ||
15 | +++ b/crypto/rand/rand_lib.c | ||
16 | @@ -235,8 +235,9 @@ size_t rand_drbg_get_nonce(RAND_DRBG *drbg, | ||
17 | struct { | ||
18 | void * instance; | ||
19 | int count; | ||
20 | - } data = { NULL, 0 }; | ||
21 | + } data; | ||
22 | |||
23 | + memset(&data, 0, sizeof(data)); | ||
24 | pool = rand_pool_new(0, min_len, max_len); | ||
25 | if (pool == NULL) | ||
26 | return 0; | ||
27 | -- | ||
28 | 2.20.1 | ||
29 | |||
diff --git a/recipes-connectivity/openssl/openssl_1.1.1c.bbappend b/recipes-connectivity/openssl/openssl_1.1.1c.bbappend new file mode 100644 index 0000000..85fca9b --- /dev/null +++ b/recipes-connectivity/openssl/openssl_1.1.1c.bbappend | |||
@@ -0,0 +1,4 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||
2 | |||
3 | # from https://github.com/openssl/openssl/pull/8606 | ||
4 | SRC_URI += "file://0001-Fix-broken-change-from-b3d113e.patch" | ||