Andrew Geissler | 4ed12e1 | 2020-06-05 18:00:41 -0500 | [diff] [blame] | 1 | From a4b6d9ce64f132e463b9091d0536913ddaf11516 Mon Sep 17 00:00:00 2001 |
| 2 | From: Neil Horman <nhorman@tuxdriver.com> |
| 3 | Date: Thu, 30 Apr 2020 16:57:35 -0400 |
| 4 | Subject: [PATCH] Remove name conflict with libc encrypt |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Forgot to fixup the funciton name conflict with libcs encrypt() function |
| 10 | on power systems |
| 11 | |
| 12 | Upstream-Status: Backport [https://github.com/nhorman/rng-tools/commit/a4b6d9ce64f132e463b9091d0536913ddaf11516] |
| 13 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 14 | Signed-off-by: Neil Horman <nhorman@tuxdriver.com> |
| 15 | Reported-by: Natanael Copa <ncopa@alpinelinux.org> |
| 16 | Reported-by: "Milan P. Stanić" <mps@arvanta.net> |
| 17 | --- |
| 18 | rngd_darn.c | 4 ++-- |
| 19 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 20 | |
| 21 | diff --git a/rngd_darn.c b/rngd_darn.c |
| 22 | index 35df7a1..9345895 100644 |
| 23 | --- a/rngd_darn.c |
| 24 | +++ b/rngd_darn.c |
| 25 | @@ -109,7 +109,7 @@ static int init_openssl(struct rng *ent_src) |
| 26 | return 0; |
| 27 | } |
| 28 | |
| 29 | -int encrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, |
| 30 | +static int osslencrypt(unsigned char *plaintext, int plaintext_len, unsigned char *key, |
| 31 | unsigned char *iv, unsigned char *ciphertext) |
| 32 | { |
| 33 | int len; |
| 34 | @@ -150,7 +150,7 @@ static inline int openssl_mangle(unsigned char *tmp, struct rng *ent_src) |
| 35 | unsigned char ciphertext[CHUNK_SIZE * RDRAND_ROUNDS]; |
| 36 | |
| 37 | /* Encrypt the plaintext */ |
| 38 | - ciphertext_len = encrypt (tmp, strlen(tmp), key, iv_buf, |
| 39 | + ciphertext_len = osslencrypt (tmp, strlen(tmp), key, iv_buf, |
| 40 | ciphertext); |
| 41 | printf("Calling mangle with len %d\n", ciphertext_len); |
| 42 | if (!ciphertext_len) |