1 From 330c2ba14510c8103b30d5021adb18f1534031a1 Mon Sep 17 00:00:00 2001
2 From: Matthias Schiffer <matthias.schiffer@tq-group.com>
3 Date: Wed, 27 Jan 2021 16:18:09 +0100
4 Subject: [PATCH] rngd_jitter: initialize AES key before setting the entropy
7 Signed-off-by: Matthias Schiffer <matthias.schiffer@tq-group.com>
9 rngd_jitter.c | 9 +++++----
10 1 file changed, 5 insertions(+), 4 deletions(-)
12 diff --git a/rngd_jitter.c b/rngd_jitter.c
13 index 25b3543..48f344c 100644
16 @@ -463,10 +463,6 @@ int init_jitter_entropy_source(struct rng *ent_src)
17 pthread_mutex_unlock(&tdata[i].statemtx);
20 - flags = fcntl(pipefds[0], F_GETFL, 0);
21 - flags |= O_NONBLOCK;
22 - fcntl(pipefds[0], F_SETFL, flags);
24 if (ent_src->rng_options[JITTER_OPT_USE_AES].int_val) {
27 @@ -487,6 +483,11 @@ int init_jitter_entropy_source(struct rng *ent_src)
28 ent_src->rng_options[JITTER_OPT_USE_AES].int_val = 1;
30 xread_jitter(aes_buf, tdata[0].buf_sz, ent_src);
32 + flags = fcntl(pipefds[0], F_GETFL, 0);
33 + flags |= O_NONBLOCK;
34 + fcntl(pipefds[0], F_SETFL, flags);
37 message_entsrc(ent_src,LOG_CONS|LOG_INFO, "libgcrypt not available. Disabling AES in JITTER source\n");
38 ent_src->rng_options[JITTER_OPT_USE_AES].int_val = 0;