From 12dbe3116ed539767ca5d283dd558b565e864a2c Mon Sep 17 00:00:00 2001 From: Laurent Bonnans Date: Tue, 16 Jul 2019 17:23:02 +0200 Subject: Include a valgrind fix for Openssl 1.1.1c Signed-off-by: Laurent Bonnans --- .../0001-Fix-broken-change-from-b3d113e.patch | 29 ++++++++++++++++++++++ .../openssl/openssl_1.1.1c.bbappend | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 recipes-connectivity/openssl/files/0001-Fix-broken-change-from-b3d113e.patch create mode 100644 recipes-connectivity/openssl/openssl_1.1.1c.bbappend 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 @@ +From 711a161f03ef9ed7cd149a22bf1203700c103e96 Mon Sep 17 00:00:00 2001 +From: Pauli +Date: Fri, 29 Mar 2019 09:24:07 +1000 +Subject: [PATCH] Fix broken change from b3d113e. + +Reviewed-by: Tim Hudson +(Merged from https://github.com/openssl/openssl/pull/8606) +--- + 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/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 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +# from https://github.com/openssl/openssl/pull/8606 +SRC_URI += "file://0001-Fix-broken-change-from-b3d113e.patch" -- cgit v1.2.3-54-g00ecf