1 --- net-snmp-5.4.1/snmplib/scapi.c	Fri Sep 15 05:47:01 2006

     2 +++ net-snmp-5.4.1.mod/snmplib/scapi.c	Sat Jul  4 02:58:34 2009

     3 @@ -406,11 +406,11 @@

     4      int            rval = SNMPERR_SUCCESS;

     5  #endif

     6      int            ret;

     7 +    unsigned int   tmp_len;

     8  

     9  #ifdef NETSNMP_USE_OPENSSL

    10      const EVP_MD   *hashfn;

    11      EVP_MD_CTX     ctx, *cptr;

    12 -    unsigned int   tmp_len;

    13  #endif

    14  

    15      DEBUGTRACE;

    16 @@ -479,13 +479,11 @@

    17  

    18  #ifndef NETSNMP_DISABLE_MD5

    19      if (ISTRANSFORM(hashtype, HMACMD5Auth)) {

    20 -	rval = pkcs_digest(CKM_MD5, buf, buf_len, MAC, &tmp_len);

    21 -        *MAC_len = tmp_len;

    22 +	rval = pkcs_digest(CKM_MD5, buf, buf_len, MAC, MAC_len);

    23      } else

    24  #endif

    25          if (ISTRANSFORM(hashtype, HMACSHA1Auth)) {

    26 -	rval = pkcs_digest(CKM_SHA_1, buf, buf_len, MAC, &tmp_len);

    27 -        *MAC_len = tmp_len;

    28 +	rval = pkcs_digest(CKM_SHA_1, buf, buf_len, MAC, MAC_len);

    29      } else {

    30          return (SNMPERR_GENERR);

    31      }