Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 1 | From f3ff99736b8cccbba77349b0d10a3cee366a4c87 Mon Sep 17 00:00:00 2001 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 18 Sep 2015 00:28:45 -0400 |
| 4 | Subject: [PATCH] snmplib/keytools.c: Don't check for return from |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 5 | |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 6 | EVP_MD_CTX_init() |
| 7 | |
| 8 | EVP_MD_CTX_init() API returns void, it fixes errors with new compilers |
| 9 | |
| 10 | snmplib/keytools.c: In function 'generate_Ku': error: invalid use of void expression |
| 11 | |
| 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 13 | Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 14 | |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 15 | --- |
Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 16 | snmplib/keytools.c | 5 +---- |
| 17 | 1 file changed, 1 insertion(+), 4 deletions(-) |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 18 | |
| 19 | diff --git a/snmplib/keytools.c b/snmplib/keytools.c |
Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 20 | index 129a7c0..2fc1efc 100644 |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 21 | --- a/snmplib/keytools.c |
| 22 | +++ b/snmplib/keytools.c |
Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 23 | @@ -183,10 +183,7 @@ generate_Ku(const oid * hashtype, u_int hashtype_len, |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 24 | ctx = EVP_MD_CTX_create(); |
| 25 | #else |
| 26 | ctx = malloc(sizeof(*ctx)); |
Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 27 | - if (!EVP_MD_CTX_init(ctx)) { |
| 28 | - rval = SNMPERR_GENERR; |
| 29 | - goto generate_Ku_quit; |
| 30 | - } |
Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 31 | + EVP_MD_CTX_init(ctx); |
| 32 | #endif |
Andrew Geissler | d688a01 | 2020-09-18 13:36:00 -0500 | [diff] [blame] | 33 | if (!EVP_DigestInit(ctx, hashfn)) { |
| 34 | rval = SNMPERR_GENERR; |