diff options
author | Scott Murray <scott.murray@konsulko.com> | 2021-03-08 12:50:34 -0500 |
---|---|---|
committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-03-25 21:48:15 +0000 |
commit | 8c28d09d2a0bf3bb317170e2bddbe63e834a7b89 (patch) | |
tree | 4dbe35672238fb40a8f0ba6a843a8e38c9ad4eeb /meta-agl-core/recipes-support/rng-tools/rng-tools/0002-rngd_jitter-initialize-AES-key-before-setting-the-en.patch | |
parent | 91a98f56e0ab024f706dab56579e1a48f186b525 (diff) |
meta-agl-core: remove rng-tools bbappend
The rng-tools patches are now being applied in the upstream recipe in
dunfell 3.1.6, so the local bbappend and patches can now be dropped.
Bug-AGL: SPEC-3840
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Change-Id: Id431d9e5259fd78d6f36934ed4839ef4aa35ba2b
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26146
Tested-by: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Reviewed-by: Julien Massot <julien.massot@iot.bzh>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
(cherry picked from commit 743d2973ad2f70af0301ac4667e0ebb4ef2b1bf1)
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/26164
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'meta-agl-core/recipes-support/rng-tools/rng-tools/0002-rngd_jitter-initialize-AES-key-before-setting-the-en.patch')
-rw-r--r-- | meta-agl-core/recipes-support/rng-tools/rng-tools/0002-rngd_jitter-initialize-AES-key-before-setting-the-en.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/meta-agl-core/recipes-support/rng-tools/rng-tools/0002-rngd_jitter-initialize-AES-key-before-setting-the-en.patch b/meta-agl-core/recipes-support/rng-tools/rng-tools/0002-rngd_jitter-initialize-AES-key-before-setting-the-en.patch deleted file mode 100644 index 34f822754..000000000 --- a/meta-agl-core/recipes-support/rng-tools/rng-tools/0002-rngd_jitter-initialize-AES-key-before-setting-the-en.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 330c2ba14510c8103b30d5021adb18f1534031a1 Mon Sep 17 00:00:00 2001 -From: Matthias Schiffer <matthias.schiffer@tq-group.com> -Date: Wed, 27 Jan 2021 16:18:09 +0100 -Subject: [PATCH] rngd_jitter: initialize AES key before setting the entropy - pipe to O_NONBLOCK - -Signed-off-by: Matthias Schiffer <matthias.schiffer@tq-group.com> ---- - rngd_jitter.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/rngd_jitter.c b/rngd_jitter.c -index 25b3543..48f344c 100644 ---- a/rngd_jitter.c -+++ b/rngd_jitter.c -@@ -463,10 +463,6 @@ int init_jitter_entropy_source(struct rng *ent_src) - pthread_mutex_unlock(&tdata[i].statemtx); - } - -- flags = fcntl(pipefds[0], F_GETFL, 0); -- flags |= O_NONBLOCK; -- fcntl(pipefds[0], F_SETFL, flags); -- - if (ent_src->rng_options[JITTER_OPT_USE_AES].int_val) { - #ifdef HAVE_LIBGCRYPT - /* -@@ -487,6 +483,11 @@ int init_jitter_entropy_source(struct rng *ent_src) - ent_src->rng_options[JITTER_OPT_USE_AES].int_val = 1; - } - xread_jitter(aes_buf, tdata[0].buf_sz, ent_src); -+ -+ flags = fcntl(pipefds[0], F_GETFL, 0); -+ flags |= O_NONBLOCK; -+ fcntl(pipefds[0], F_SETFL, flags); -+ - #else - message_entsrc(ent_src,LOG_CONS|LOG_INFO, "libgcrypt not available. Disabling AES in JITTER source\n"); - ent_src->rng_options[JITTER_OPT_USE_AES].int_val = 0; |