From 7bf75a0d88bd7e0efddc4f8d1db24f6bbdd1e37e Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Mon, 22 Jul 2019 16:03:58 -0700 Subject: openssl: Remove redundant patch Remove the patch as it is already applied in the meta layer. Signed-off-by: Alistair Francis --- .../0001-Fix-broken-change-from-b3d113e.patch | 29 ---------------------- .../openssl/openssl_1.1.1c.bbappend | 4 --- 2 files changed, 33 deletions(-) delete mode 100644 recipes-connectivity/openssl/files/0001-Fix-broken-change-from-b3d113e.patch delete 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 deleted file mode 100644 index b176cc7..0000000 --- a/recipes-connectivity/openssl/files/0001-Fix-broken-change-from-b3d113e.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 deleted file mode 100644 index 85fca9b..0000000 --- a/recipes-connectivity/openssl/openssl_1.1.1c.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -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