mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-01 01:30:23 +00:00
Code Issues Projects Releases Wiki Activity

net-snmp: Refresh openssl support patch

Browse Source 
Avoid fuzz warnings

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2018-06-24 12:00:09 -07:00
parent badb14da16
commit 872399c751
1 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-protocols/net-snmp/net-snmp/fix-openssl-build-errors.patch
+30 -20
View File
@@ -5,8 +5,10 @@ OpenSSL 1.0.x and 1.1.x.
Author: Sharmila Podury <sharmila.podury@brocade.com> Author: Sharmila Podury <sharmila.podury@brocade.com>
--- a/apps/snmpusm.c Index: net-snmp-5.7.3/apps/snmpusm.c
+++ b/apps/snmpusm.c ===================================================================
--- net-snmp-5.7.3.orig/apps/snmpusm.c
+++ net-snmp-5.7.3/apps/snmpusm.c
@@ -125,6 +125,32 @@ char *usmUserPublic_val = NULL @@ -125,6 +125,32 @@ char *usmUserPublic_val = NULL
int docreateandwait = 0; int docreateandwait = 0;
@@ -85,10 +87,12 @@ Author: Sharmila Podury <sharmila.podury@brocade.com>
key_len = DH_size(dh); key_len = DH_size(dh);
if (!key_len) { if (!key_len) {
--- a/configure.d/config_os_libs2 Index: net-snmp-5.7.3/configure.d/config_os_libs2
+++ b/configure.d/config_os_libs2 ===================================================================
@@ -327,10 +327,16 @@ if test "x$tryopenssl" != "xno" -a "x$tr --- net-snmp-5.7.3.orig/configure.d/config_os_libs2
[[#include <openssl/evp.h>]]) +++ net-snmp-5.7.3/configure.d/config_os_libs2
@@ -293,10 +293,16 @@ if test "x$tryopenssl" != "xno" -a "x$tr
[Define to 1 if you have the `AES_cfb128_encrypt' function.]))
AC_CHECK_LIB(${CRYPTO}, EVP_MD_CTX_create, AC_CHECK_LIB(${CRYPTO}, EVP_MD_CTX_create,
- AC_DEFINE([HAVE_EVP_MD_CTX_CREATE], [], - AC_DEFINE([HAVE_EVP_MD_CTX_CREATE], [],
@@ -106,9 +110,11 @@ Author: Sharmila Podury <sharmila.podury@brocade.com>
fi fi
if echo " $transport_result_list " | $GREP "DTLS" > /dev/null; then if echo " $transport_result_list " | $GREP "DTLS" > /dev/null; then
AC_CHECK_LIB(ssl, DTLSv1_method, AC_CHECK_LIB(ssl, DTLSv1_method,
--- a/include/net-snmp/net-snmp-config.h.in Index: net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in
+++ b/include/net-snmp/net-snmp-config.h.in ===================================================================
@@ -164,6 +164,12 @@ --- net-snmp-5.7.3.orig/include/net-snmp/net-snmp-config.h.in
+++ net-snmp-5.7.3/include/net-snmp/net-snmp-config.h.in
@@ -155,6 +155,12 @@
/* Define to 1 if you have the `EVP_MD_CTX_destroy' function. */ /* Define to 1 if you have the `EVP_MD_CTX_destroy' function. */
#undef HAVE_EVP_MD_CTX_DESTROY #undef HAVE_EVP_MD_CTX_DESTROY
@@ -121,11 +127,13 @@ Author: Sharmila Podury <sharmila.podury@brocade.com>
/* Define if you have EVP_sha224/256 in openssl */ /* Define if you have EVP_sha224/256 in openssl */
#undef HAVE_EVP_SHA224 #undef HAVE_EVP_SHA224
--- a/snmplib/keytools.c Index: net-snmp-5.7.3/snmplib/keytools.c
+++ b/snmplib/keytools.c ===================================================================
@@ -176,7 +176,9 @@ generate_Ku(const oid * hashtype, u_int --- net-snmp-5.7.3.orig/snmplib/keytools.c
QUITFUN(SNMPERR_GENERR, generate_Ku_quit); +++ net-snmp-5.7.3/snmplib/keytools.c
} @@ -149,7 +149,9 @@ generate_Ku(const oid * hashtype, u_int
*/
#ifdef NETSNMP_USE_OPENSSL
-#ifdef HAVE_EVP_MD_CTX_CREATE -#ifdef HAVE_EVP_MD_CTX_CREATE
+#ifdef HAVE_EVP_MD_CTX_NEW +#ifdef HAVE_EVP_MD_CTX_NEW
@@ -134,7 +142,7 @@ Author: Sharmila Podury <sharmila.podury@brocade.com>
ctx = EVP_MD_CTX_create(); ctx = EVP_MD_CTX_create();
#else #else
ctx = malloc(sizeof(*ctx)); ctx = malloc(sizeof(*ctx));
@@ -278,7 +280,9 @@ generate_Ku(const oid * hashtype, u_int @@ -258,7 +260,9 @@ generate_Ku(const oid * hashtype, u_int
memset(buf, 0, sizeof(buf)); memset(buf, 0, sizeof(buf));
#ifdef NETSNMP_USE_OPENSSL #ifdef NETSNMP_USE_OPENSSL
if (ctx) { if (ctx) {
@@ -145,10 +153,12 @@ Author: Sharmila Podury <sharmila.podury@brocade.com>
EVP_MD_CTX_destroy(ctx); EVP_MD_CTX_destroy(ctx);
#else #else
EVP_MD_CTX_cleanup(ctx); EVP_MD_CTX_cleanup(ctx);
--- a/snmplib/scapi.c Index: net-snmp-5.7.3/snmplib/scapi.c
+++ b/snmplib/scapi.c ===================================================================
@@ -627,7 +627,9 @@ sc_hash(const oid * hashtype, size_t has --- net-snmp-5.7.3.orig/snmplib/scapi.c
return SNMPERR_GENERR; +++ net-snmp-5.7.3/snmplib/scapi.c
@@ -488,7 +488,9 @@ sc_hash(const oid * hashtype, size_t has
}
/** initialize the pointer */ /** initialize the pointer */
-#ifdef HAVE_EVP_MD_CTX_CREATE -#ifdef HAVE_EVP_MD_CTX_CREATE
@@ -158,7 +168,7 @@ Author: Sharmila Podury <sharmila.podury@brocade.com>
cptr = EVP_MD_CTX_create(); cptr = EVP_MD_CTX_create();
#else #else
cptr = malloc(sizeof(*cptr)); cptr = malloc(sizeof(*cptr));
@@ -648,7 +650,9 @@ sc_hash(const oid * hashtype, size_t has @@ -509,7 +511,9 @@ sc_hash(const oid * hashtype, size_t has
/** do the final pass */ /** do the final pass */
EVP_DigestFinal(cptr, MAC, &tmp_len); EVP_DigestFinal(cptr, MAC, &tmp_len);
*MAC_len = tmp_len; *MAC_len = tmp_len;