mirror of
https://git.yoctoproject.org/poky
synced 2026-04-13 14:02:21 +02:00
rng-tools: upgrade 6.10 -> 6.11
Remove backported patches. (From OE-Core rev: bcb0895c41ca97fdf1d53d8368ff46d5968cdc4a) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Yi Zhao
@@ -1,46 +0,0 @@
|
||||
From 213a869e8315ead2c739acfcbde712358a842dee Mon Sep 17 00:00:00 2001
|
||||
From: Yann Dirson <yann@blade-group.com>
|
||||
Date: Fri, 9 Oct 2020 15:12:26 +0200
|
||||
Subject: [PATCH] rngd: fix --debug to also filter syslog() calls
|
||||
|
||||
Debug logs were only controlled by --debug flag while in --foreground
|
||||
mode. In --daemon mode /var/log/message got stuffed with details of
|
||||
entropy pool refilling, which is useless in production, and hamful
|
||||
when log rotation then gets rid of the more useful logs. This is
|
||||
especially true for embedded systems.
|
||||
|
||||
This change makes the two modes consistently only produce debug logs when
|
||||
--debug is specified.
|
||||
|
||||
Upstream-Status: Backport [213a869e8315ead2c739acfcbde712358a842dee]
|
||||
|
||||
Signed-off-by: Yann Dirson <yann@blade-group.com>
|
||||
---
|
||||
rngd.h | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/rngd.h b/rngd.h
|
||||
index 901b6f1..a79ea0f 100644
|
||||
--- a/rngd.h
|
||||
+++ b/rngd.h
|
||||
@@ -166,13 +166,13 @@ extern bool quiet;
|
||||
#define message(priority,fmt,args...) do { \
|
||||
if (quiet) \
|
||||
break;\
|
||||
+ if (arguments->debug == false && LOG_PRI(priority) == LOG_DEBUG) \
|
||||
+ break;\
|
||||
if (am_daemon) { \
|
||||
syslog((priority), fmt, ##args); \
|
||||
} else if (!msg_squash) { \
|
||||
- if ((LOG_PRI(priority) != LOG_DEBUG) || (arguments->debug == true)) {\
|
||||
- fprintf(stderr, fmt, ##args); \
|
||||
- fflush(stderr); \
|
||||
- } \
|
||||
+ fprintf(stderr, fmt, ##args); \
|
||||
+ fflush(stderr); \
|
||||
} \
|
||||
} while (0)
|
||||
|
||||
--
|
||||
2.28.0
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
From a4b6d9ce64f132e463b9091d0536913ddaf11516 Mon Sep 17 00:00:00 2001
|
||||
From: Neil Horman <nhorman@tuxdriver.com>
|
||||
Date: Thu, 30 Apr 2020 16:57:35 -0400
|
||||
Subject: [PATCH] Remove name conflict with libc encrypt
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Forgot to fixup the funciton name conflict with libcs encrypt() function
|
||||
on power systems
|
||||
|
||||
Upstream-Status: Backport [https://github.com/nhorman/rng-tools/commit/a4b6d9ce64f132e463b9091d0536913ddaf11516]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
|
||||
Reported-by: Natanael Copa <ncopa@alpinelinux.org>
|
||||
Reported-by: "Milan P. Stanić" <mps@arvanta.net>
|
||||
---
|
||||
rngd_darn.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/rngd_darn.c b/rngd_darn.c
|
||||
index 35df7a1..9345895 100644
|
||||
--- a/rngd_darn.c
|
||||
+++ b/rngd_darn.c
|
||||
@@ -109,7 +109,7 @@ static int init_openssl(struct rng *ent_src)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
|
||||
+static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
|
||||
unsigned char *iv, unsigned char *ciphertext)
|
||||
{
|
||||
int len;
|
||||
@@ -150,7 +150,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src)
|
||||
unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS];
|
||||
|
||||
/* Encrypt the plaintext */
|
||||
- ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf,
|
||||
+ ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf,
|
||||
ciphertext);
|
||||
printf("Calling mangle with len %d\n", ciphertext_len);
|
||||
if (!ciphertext_len)
|
||||
@@ -1,51 +0,0 @@
|
||||
From dab16a5fd4efde8ef569b358e19b1fcbc7d0d938 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Mon, 30 Mar 2020 00:10:46 +0200
|
||||
Subject: [PATCH] rngd_jitter: disambiguate call to encrypt
|
||||
|
||||
Commit 0f184ea7e792427fb20afe81d471b565aee96f0b disambiguate the call to
|
||||
encrypt in rngd_rdrand.c but did not update rngd_jitter.c.
|
||||
|
||||
This raise the following build failure:
|
||||
|
||||
rngd_jitter.c:75:12: error: conflicting types for 'encrypt'
|
||||
static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
|
||||
^~~~~~~
|
||||
In file included from rngd_jitter.c:27:
|
||||
/home/dawncrow/buildroot-test/scripts/instance-0/output-1/host/powerpc-buildroot-linux-uclibc/sysroot/usr/include/unistd.h:1132:13: note: previous declaration of 'encrypt' was here
|
||||
extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1));
|
||||
^~~~~~~
|
||||
Makefile:770: recipe for target 'rngd-rngd_jitter.o' failed
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/0ca6bf16e3acbc94065b88c4442d6595424b77cb
|
||||
|
||||
Upstream-Status: Backport [https://github.com/nhorman/rng-tools/commit/dab16a5fd4efde8ef569b358e19b1fcbc7d0d938]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
rngd_jitter.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/rngd_jitter.c b/rngd_jitter.c
|
||||
index c1b1aca..49a3825 100644
|
||||
--- a/rngd_jitter.c
|
||||
+++ b/rngd_jitter.c
|
||||
@@ -72,7 +72,7 @@ unsigned char *aes_buf;
|
||||
char key[AES_BLOCK];
|
||||
static unsigned char iv_buf[CHUNK_SIZE] __attribute__((aligned(128)));
|
||||
|
||||
-static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
|
||||
+static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key,
|
||||
unsigned char *iv, unsigned char *ciphertext)
|
||||
{
|
||||
EVP_CIPHER_CTX *ctx;
|
||||
@@ -122,7 +122,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src)
|
||||
unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS];
|
||||
|
||||
/* Encrypt the plaintext */
|
||||
- ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf,
|
||||
+ ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf,
|
||||
ciphertext);
|
||||
if (!ciphertext_len)
|
||||
return -1;
|
||||
@@ -10,14 +10,11 @@ DEPENDS = "sysfsutils openssl"
|
||||
|
||||
SRC_URI = "\
|
||||
git://github.com/nhorman/rng-tools.git \
|
||||
file://a4b6d9ce64f132e463b9091d0536913ddaf11516.patch \
|
||||
file://dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch \
|
||||
file://0001-rngd-fix-debug-to-also-filter-syslog-calls.patch \
|
||||
file://init \
|
||||
file://default \
|
||||
file://rngd.service \
|
||||
"
|
||||
SRCREV = "0be82200a66d9321451e0a0785bfae350b9cffdc"
|
||||
SRCREV = "2ea13473fd5bfea3c861dc0e23bd65e2afe8007b"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
Reference in New Issue
Block a user