summaryrefslogtreecommitdiff
path: root/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch')
-rw-r--r--meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
index 7e686ce7fe..33a1e745fa 100644
--- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
+++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
@@ -1,4 +1,4 @@
-From e38c508ef401593b1d4fe42b62e42a49cfec82af Mon Sep 17 00:00:00 2001
+From 383e67e359b89abe0440597ce414297892ade511 Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Tue, 26 Feb 2019 14:26:07 +0800
Subject: [PATCH] net-snmp: fix compile error with --disable-des
@@ -12,12 +12,12 @@ Subject: [PATCH] net-snmp: fix compile error with --disable-des
pad_size is defined only without --disable-des
[snip]
#ifndef NETSNMP_DISABLE_DES
- int pad, plast, pad_size = 0;
+ int pad, plast, pad_size = 0;
but used when disable-des,
[snip]
QUITFUN(SNMPERR_GENERR, sc_encrypt_quit);
- }
+ }
pad_size = pai->pad_size;
memset(my_iv, 0, sizeof(my_iv));
@@ -37,10 +37,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/snmplib/scapi.c b/snmplib/scapi.c
-index 43caddf..c09deb0 100644
+index 8ad1d70d90..8c6882d9ab 100644
--- a/snmplib/scapi.c
+++ b/snmplib/scapi.c
-@@ -1253,7 +1253,6 @@ sc_encrypt(const oid * privtype, size_t privtypelen,
+@@ -1251,7 +1251,6 @@ sc_encrypt(const oid * privtype, size_t privtypelen,
QUITFUN(SNMPERR_GENERR, sc_encrypt_quit);
}
@@ -48,7 +48,7 @@ index 43caddf..c09deb0 100644
memset(my_iv, 0, sizeof(my_iv));
-@@ -1263,6 +1262,8 @@ sc_encrypt(const oid * privtype, size_t privtypelen,
+@@ -1261,6 +1260,8 @@ sc_encrypt(const oid * privtype, size_t privtypelen,
/*
* now calculate the padding needed
*/
@@ -58,5 +58,5 @@ index 43caddf..c09deb0 100644
plast = (int) ptlen - (pad_size - pad);
if (pad == pad_size)
--
-2.7.4
+2.26.2