- fixed unexpected length for type ASN_UNSIGNED (#151892)

- fixed uptime problems on ia64
This commit is contained in:
Radek Vokál 2005-03-24 12:41:07 +00:00
parent e63664725f
commit b103b40370
2 changed files with 40 additions and 2 deletions

View File

@ -0,0 +1,30 @@
--- snmplib/scapi.c
+++ snmplib/scapi.c
@@ -334,6 +334,7 @@
int rval = SNMPERR_SUCCESS;
const EVP_MD *hashfn;
EVP_MD_CTX ctx, *cptr;
+ unsigned int tmp_len;
#endif
DEBUGTRACE;
@@ -379,13 +380,16 @@
/** do the final pass */
#if defined(OLD_DES)
- EVP_DigestFinal(cptr, MAC, MAC_len);
+ EVP_DigestFinal(cptr, MAC, &tmp_len);
+ *MAC_len = tmp_len;
#else /* !OLD_DES */
if (SSLeay() < 0x907000) {
- EVP_DigestFinal(cptr, MAC, MAC_len);
+ EVP_DigestFinal(cptr, MAC, &tmp_len);
+ *MAC_len = tmp_len;
free(cptr);
} else {
- EVP_DigestFinal_ex(cptr, MAC, MAC_len);
+ EVP_DigestFinal_ex(cptr, MAC, &tmp_len);
+ *MAC_len = tmp_len;
EVP_MD_CTX_cleanup(cptr);
}
#endif

View File

@ -3,7 +3,7 @@
Summary: A collection of SNMP protocol tools and libraries.
Name: net-snmp
Version: 5.2.1
Release: 5
Release: 6
License: BSDish
Group: System Environment/Daemons
URL: http://net-snmp.sourceforge.net/
@ -31,12 +31,14 @@ Patch12: net-snmp-5.1.2-dir-fix.patch
#Patch13: net-snmp-5.2-ipsystemstats.patch
Patch14: net-snmp-5.1.2-conf_list.patch
Patch15: net-snmp-5.2.1-trim.patch
Patch16: net-snmp-5.1.2-ASN-unsigned64.patch
Patch17: net-snmp-5.2.1-typeclash.diff
Prereq: /sbin/chkconfig
Obsoletes: ucd-snmp
BuildRoot: %{_tmppath}/%{name}-root
BuildPrereq: openssl-devel, bzip2-devel, beecrypt-devel, elfutils-devel, libselinux-devel
%ifarch %{ix86}
%ifarch %{ix86} x86_64
BuildPrereq: lm_sensors-devel
%endif
%if %{tcp_wrappers}
@ -141,6 +143,8 @@ and applications.
# from CVS
%patch15 -p1 -b .trim
%patch16 -p1 -b .ASN-unsigned64
%patch17 -b .typeclash
# Do this patch with a perl hack...
perl -pi -e "s|'\\\$install_libdir'|'%{_libdir}'|" ltmain.sh
@ -318,6 +322,10 @@ rm -rf ${RPM_BUILD_ROOT}
%{_libdir}/*.la
%changelog
* Thu Mar 24 2005 Radek Vokal <rvokal@redhat.com> - 5.2.1-6
- fixed unexpected length for type ASN_UNSIGNED (#151892)
- fixed uptime problems on ia64
* Wed Mar 09 2005 Radek Vokal <rvokal@redhat.com> - 5.2.1-5
- 64bit needed some changes, was causing timeouts on 64bit archs!?
- affects bugs #125432 and #132058