diff options
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.patch | 62 |
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 @@ | |||
| 1 | From 383e67e359b89abe0440597ce414297892ade511 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Changqing Li <changqing.li@windriver.com> | ||
| 3 | Date: Tue, 26 Feb 2019 14:26:07 +0800 | ||
| 4 | Subject: [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 | |||
| 12 | pad_size is defined only without --disable-des | ||
| 13 | [snip] | ||
| 14 | #ifndef NETSNMP_DISABLE_DES | ||
| 15 | int pad, plast, pad_size = 0; | ||
| 16 | |||
| 17 | but 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 | |||
| 30 | fix by move it into #ifndef NETSNMP_DISABLE_DES | ||
| 31 | |||
| 32 | Upstream-Status: Submitted [https://sourceforge.net/p/net-snmp/bugs/2927/] | ||
| 33 | |||
| 34 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
| 35 | --- | ||
| 36 | snmplib/scapi.c | 3 ++- | ||
| 37 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
| 38 | |||
| 39 | diff --git a/snmplib/scapi.c b/snmplib/scapi.c | ||
| 40 | index 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 | -- | ||
| 61 | 2.26.2 | ||
| 62 | |||
