summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
diff options
context:
space:
mode:
authorOvidiu Panait <ovidiu.panait@windriver.com>2020-08-31 19:14:01 +0300
committerKhem Raj <raj.khem@gmail.com>2020-08-31 13:04:43 -0700
commitdbf619019d0b1261a0abdef9049c1e99bf2fa714 (patch)
treebd8453afc78712498b35183e7dd249f7eb0aa869 /meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
parentb10cbda2867ff63f70357bb5e39c16391a22aede (diff)
downloadmeta-openembedded-dbf619019d0b1261a0abdef9049c1e99bf2fa714.tar.gz
net-snmp: upgrade 5.8 -> 5.9
Upgrade net-snmp 5.8 -> 5.9: * refresh patches * drop backports: https://github.com/net-snmp/net-snmp/commit/5f881d3bf24599b90d67a45cae7a3eb099cd71c9 https://github.com/net-snmp/net-snmp/commit/6e1329bde834e0edcfadb88d3c05e6015e945638 https://github.com/net-snmp/net-snmp/commit/abdcb6af8df352a257a7092c1649471af1e4e97b https://github.com/net-snmp/net-snmp/commit/21260fdd60c172839f997fb6f888a6e21c6825eb Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch')
-rw-r--r--meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch62
1 files changed, 0 insertions, 62 deletions
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch b/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
deleted file mode 100644
index 33a1e745fa..0000000000
--- a/meta-networking/recipes-protocols/net-snmp/net-snmp/0001-net-snmp-fix-compile-error-disable-des.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From 383e67e359b89abe0440597ce414297892ade511 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 26 Feb 2019 14:26:07 +0800
4Subject: [PATCH] net-snmp: fix compile error with --disable-des
5
6| scapi.c: In function 'sc_encrypt':
7| scapi.c:1256:5: error: 'pad_size' undeclared (first use in this function); did you mean 'dysize'?
8| pad_size = pai->pad_size;
9| ^~~~~~~~
10| dysize
11
12pad_size is defined only without --disable-des
13[snip]
14#ifndef NETSNMP_DISABLE_DES
15 int pad, plast, pad_size = 0;
16
17but used when disable-des,
18[snip]
19 QUITFUN(SNMPERR_GENERR, sc_encrypt_quit);
20 }
21 pad_size = pai->pad_size;
22
23 memset(my_iv, 0, sizeof(my_iv));
24
25#ifndef NETSNMP_DISABLE_DES
26 if (USM_CREATE_USER_PRIV_DES == (pai->type & USM_PRIV_MASK_ALG)) {
27
28 /*
29
30fix by move it into #ifndef NETSNMP_DISABLE_DES
31
32Upstream-Status: Submitted [https://sourceforge.net/p/net-snmp/bugs/2927/]
33
34Signed-off-by: Changqing Li <changqing.li@windriver.com>
35---
36 snmplib/scapi.c | 3 ++-
37 1 file changed, 2 insertions(+), 1 deletion(-)
38
39diff --git a/snmplib/scapi.c b/snmplib/scapi.c
40index 8ad1d70d90..8c6882d9ab 100644
41--- a/snmplib/scapi.c
42+++ b/snmplib/scapi.c
43@@ -1251,7 +1251,6 @@ sc_encrypt(const oid * privtype, size_t privtypelen,
44
45 QUITFUN(SNMPERR_GENERR, sc_encrypt_quit);
46 }
47- pad_size = pai->pad_size;
48
49 memset(my_iv, 0, sizeof(my_iv));
50
51@@ -1261,6 +1260,8 @@ sc_encrypt(const oid * privtype, size_t privtypelen,
52 /*
53 * now calculate the padding needed
54 */
55+
56+ pad_size = pai->pad_size;
57 pad = pad_size - (ptlen % pad_size);
58 plast = (int) ptlen - (pad_size - pad);
59 if (pad == pad_size)
60--
612.26.2
62