summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlistair Francis <alistair.francis@wdc.com>2019-07-22 16:03:58 -0700
committerAlistair Francis <alistair.francis@wdc.com>2019-07-22 16:03:58 -0700
commit7bf75a0d88bd7e0efddc4f8d1db24f6bbdd1e37e (patch)
treee5f12f225e822f8e8b1bd83865ddf84905309d72
parent3f4235eb200977fb1beead5d27cb3123cae1d410 (diff)
downloadmeta-updater-7bf75a0d88bd7e0efddc4f8d1db24f6bbdd1e37e.tar.gz
openssl: Remove redundant patch
Remove the patch as it is already applied in the meta layer. Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
-rw-r--r--recipes-connectivity/openssl/files/0001-Fix-broken-change-from-b3d113e.patch29
-rw-r--r--recipes-connectivity/openssl/openssl_1.1.1c.bbappend4
2 files changed, 0 insertions, 33 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
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 @@
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---
9 crypto/rand/rand_lib.c | 3 ++-
10 1 file changed, 2 insertions(+), 1 deletion(-)
11
12diff --git a/crypto/rand/rand_lib.c b/crypto/rand/rand_lib.c
13index 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--
282.20.1
29
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 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
2
3# from https://github.com/openssl/openssl/pull/8606
4SRC_URI += "file://0001-Fix-broken-change-from-b3d113e.patch"