diff options
Diffstat (limited to 'meta/recipes-support/rng-tools/rng-tools/dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch')
-rw-r--r-- | meta/recipes-support/rng-tools/rng-tools/dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/meta/recipes-support/rng-tools/rng-tools/dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch b/meta/recipes-support/rng-tools/rng-tools/dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch deleted file mode 100644 index 93103ef79f..0000000000 --- a/meta/recipes-support/rng-tools/rng-tools/dab16a5fd4efde8ef569b358e19b1fcbc7d0d938.patch +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | From dab16a5fd4efde8ef569b358e19b1fcbc7d0d938 Mon Sep 17 00:00:00 2001 | ||
2 | From: Fabrice Fontaine <fontaine.fabrice@gmail.com> | ||
3 | Date: Mon, 30 Mar 2020 00:10:46 +0200 | ||
4 | Subject: [PATCH] rngd_jitter: disambiguate call to encrypt | ||
5 | |||
6 | Commit 0f184ea7e792427fb20afe81d471b565aee96f0b disambiguate the call to | ||
7 | encrypt in rngd_rdrand.c but did not update rngd_jitter.c. | ||
8 | |||
9 | This raise the following build failure: | ||
10 | |||
11 | rngd_jitter.c:75:12: error: conflicting types for 'encrypt' | ||
12 | static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, | ||
13 | ^~~~~~~ | ||
14 | In file included from rngd_jitter.c:27: | ||
15 | /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 | ||
16 | extern void encrypt (char *__block, int __edflag) __THROW __nonnull ((1)); | ||
17 | ^~~~~~~ | ||
18 | Makefile:770: recipe for target 'rngd-rngd_jitter.o' failed | ||
19 | |||
20 | Fixes: | ||
21 | - http://autobuild.buildroot.org/results/0ca6bf16e3acbc94065b88c4442d6595424b77cb | ||
22 | |||
23 | Upstream-Status: Backport [https://github.com/nhorman/rng-tools/commit/dab16a5fd4efde8ef569b358e19b1fcbc7d0d938] | ||
24 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
25 | Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> | ||
26 | --- | ||
27 | rngd_jitter.c | 4 ++-- | ||
28 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
29 | |||
30 | diff --git a/rngd_jitter.c b/rngd_jitter.c | ||
31 | index c1b1aca..49a3825 100644 | ||
32 | --- a/rngd_jitter.c | ||
33 | +++ b/rngd_jitter.c | ||
34 | @@ -72,7 +72,7 @@ unsigned char *aes_buf; | ||
35 | char key[AES_BLOCK]; | ||
36 | static unsigned char iv_buf[CHUNK_SIZE] __attribute__((aligned(128))); | ||
37 | |||
38 | -static int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, | ||
39 | +static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, | ||
40 | unsigned char *iv, unsigned char *ciphertext) | ||
41 | { | ||
42 | EVP_CIPHER_CTX *ctx; | ||
43 | @@ -122,7 +122,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src) | ||
44 | unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS]; | ||
45 | |||
46 | /* Encrypt the plaintext */ | ||
47 | - ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf, | ||
48 | + ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf, | ||
49 | ciphertext); | ||
50 | if (!ciphertext_len) | ||
51 | return -1; | ||