[Mhash-dev] Re: patches to mhash-0.9.6

[Jonathan D. <im...@ya...>]

Hi,

None of these is problematic. Indeed, they are
extremely welcome. (This just leaves the 64-bit bug
and the question of what next week's lottery numbers
are...)

Thanks,

Jonathan Day

--- Chris Hanson <cp...@cs...> wrote:

> Attached please find a patch file with several
> patches to the 0.9.6
> source.  These are the patches I've applied to the
> package in Debian
> unstable (I'm the package maintainer).  This is what
> they change:
> 
> * The #define VERSION is changed to MHASH_VERSION to
> avoid conflicts
> with other programs.  This fixes 1449426, which was
> automatically closed
> even though the published code doesn't provide a
> fix.
> 
> * A bug that causes a SIGSEGV was fixed in
> "lib/keygen_s2k.c".  This
> fixes bug 1465957.
> 
> * A compiler warning is eliminated in
> "lib/snefru.c".
> 
> * Several typos are fixed in "lib/crc32.c" and
> "lib/keygen_asis.c".
> 
> Hopefully none of these is controversial.
> 
> Also note that bug 1449417 is fixed in 0.9.6.  It
> was hard to tell,
> because once it was fixed bug 1465957 was showing
> up, and the symptoms
> were similar.
> 
> > diff -ruN mhash-0.9.6.orig/configure.in
> mhash-0.9.6/configure.in
> --- mhash-0.9.6.orig/configure.in	2006-03-15
> 14:40:57.000000000 -0500
> +++ mhash-0.9.6/configure.in	2006-05-31
> 15:09:08.000000000 -0400
> @@ -11,6 +11,7 @@
>  MHASH_VERSION=$VERSION
>  AC_SUBST(MHASH_VERSION)
>  
> +AC_DEFINE(MHASH_VERSION)
>  AC_CONFIG_HEADER([include/mutils/mhash_config.h])
>  
>  
> diff -ruN
> mhash-0.9.6.orig/include/mutils/mhash_config.h.in
> mhash-0.9.6/include/mutils/mhash_config.h.in
> ---
> mhash-0.9.6.orig/include/mutils/mhash_config.h.in
> 2006-03-15 14:41:28.000000000 -0500
> +++ mhash-0.9.6/include/mutils/mhash_config.h.in
> 2006-05-31 15:09:08.000000000 -0400
> @@ -197,7 +197,7 @@
>  #undef STDC_HEADERS
>  
>  /* Version number of package */
> -#undef VERSION
> +#undef MHASH_VERSION
>  
>  /* Define if using the dmalloc debugging malloc
> package */
>  #undef WITH_DMALLOC
> diff -ruN mhash-0.9.6.orig/lib/crc32.c
> mhash-0.9.6/lib/crc32.c
> --- mhash-0.9.6.orig/lib/crc32.c	2006-01-08
> 03:14:47.000000000 -0500
> +++ mhash-0.9.6/lib/crc32.c	2006-05-31
> 15:09:08.000000000 -0400
> @@ -188,7 +188,7 @@
>  	__const mutils_word8 *p;
>  
>  #if defined(MHASH_ROBUST)	
> -	if ((crc == NULL) || (given_buffer == NULL) ||
> (len == 0))
> +	if ((crc == NULL) || (given_buf == NULL) || (len
> == 0))
>  		return;
>  #endif
>  
> @@ -203,7 +203,7 @@
>  	__const mutils_word8 *p;
>  
>  #if defined(MHASH_ROBUST)
> -	if ((crc == NULL) || (given_buffer == NULL) ||
> (len == 0))
> +	if ((crc == NULL) || (buf == NULL) || (len == 0))
>  		return;
>  #endif
>  
> diff -ruN mhash-0.9.6.orig/lib/keygen_asis.c
> mhash-0.9.6/lib/keygen_asis.c
> --- mhash-0.9.6.orig/lib/keygen_asis.c	2006-01-08
> 03:14:47.000000000 -0500
> +++ mhash-0.9.6/lib/keygen_asis.c	2006-05-31
> 15:09:08.000000000 -0400
> @@ -25,9 +25,9 @@
>  mutils_error _mhash_gen_key_asis(void *keyword,
> mutils_word32 key_size, mutils_word8 *password,
> mutils_word32 plen)
>  {
>  #if defined(MHASH_ROBUST)
> -	if ((keyword == NULL) || (keysize == 0) ||
> +	if ((keyword == NULL) || (key_size == 0) ||
>  	    (password == NULL) || (plen == 0))
> -		return(-MUTILS_INVALID_LENGTH);
> +		return(-MUTILS_INVALID_SIZE);
>  #endif
>  
>  	if (plen > key_size)
> diff -ruN mhash-0.9.6.orig/lib/keygen_s2k.c
> mhash-0.9.6/lib/keygen_s2k.c
> --- mhash-0.9.6.orig/lib/keygen_s2k.c	2006-01-08
> 03:14:47.000000000 -0500
> +++ mhash-0.9.6/lib/keygen_s2k.c	2006-05-31
> 15:09:08.000000000 -0400
> @@ -39,12 +39,12 @@
>  	MHASH td;
>  	mutils_word32 block_size =
> mhash_get_block_size(algorithm);
>  
> -	total = times * block_size;
> -
>  	times = key_size / block_size;
>  
>  	if (key_size % block_size != 0) times++;
>  
> +	total = times * block_size;
> +
>  	key = mutils_malloc(total);
>  
>  #if defined(MHASH_ROBUST)
> diff -ruN mhash-0.9.6.orig/lib/snefru.c
> mhash-0.9.6/lib/snefru.c
> --- mhash-0.9.6.orig/lib/snefru.c	2006-03-15
> 01:23:13.000000000 -0500
> +++ mhash-0.9.6/lib/snefru.c	2006-05-31
> 15:09:08.000000000 -0400
> @@ -728,7 +728,7 @@
>  	mutils_word32 isave[SNEFRU256_DIGEST_LEN];
>  	mutils_word32 *sbox, x;
>  	mutils_word32 i, j;
> -	mutils_word32 limit;
> +	__const mutils_word32 *limit;
>  
>  	mutils_memcpy(isave, block,
> SNEFRU256_DIGEST_SIZE);
>    
> 


__________________________________________________
Do You Yahoo!?
Tired of spam?  Yahoo! Mail has the best spam protection around 
http://mail.yahoo.com