| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 068952c0e0cdda5a91250b91c5fcc9b85b43daab Mon Sep 17 00:00:00 2001 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 2 | From: Jackie Huang <jackie.huang@windriver.com> |
| 3 | Date: Thu, 22 Jun 2017 10:25:08 +0800 |
| 4 | Subject: [PATCH] net-snmp: fix for --disable-des |
| 5 | |
| 6 | Include des.h only if it's found in openssl so that |
| 7 | the --disable-des works correctly. |
| 8 | |
| 9 | Upstream-Status: Submitted [net-snmp-coders@lists.sourceforge.net] |
| 10 | |
| 11 | Signed-off-by: Jackie Huang <jackie.huang@windriver.com> |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 12 | |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 13 | --- |
| 14 | snmplib/scapi.c | 2 ++ |
| 15 | 1 file changed, 2 insertions(+) |
| 16 | |
| 17 | diff --git a/snmplib/scapi.c b/snmplib/scapi.c |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 18 | index 8ad1d70..43caddf 100644 |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 19 | --- a/snmplib/scapi.c |
| 20 | +++ b/snmplib/scapi.c |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 21 | @@ -84,7 +84,9 @@ netsnmp_feature_child_of(usm_scapi, usm_support) |
| Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 22 | #include <openssl/hmac.h> |
| 23 | #include <openssl/evp.h> |
| 24 | #include <openssl/rand.h> |
| 25 | +#ifdef HAVE_OPENSSL_DES_H |
| 26 | #include <openssl/des.h> |
| 27 | +#endif |
| 28 | #ifdef HAVE_AES |
| 29 | #include <openssl/aes.h> |
| 30 | #endif |