freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to mhash-0.9.9.9.

Browse Source 
Add descriptive headers to all the patches.
This commit is contained in:
Peter Pentchev
2009-09-10 11:50:56 +00:00
parent af4c06fa0f
commit c2de38c91d
19 changed files with 182 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
security/mhash/Makefile
+1 -1
View File
@@ -6,7 +6,7 @@
#
PORTNAME= mhash
PORTVERSION= 0.9.9
PORTVERSION= 0.9.9.9
CATEGORIES= security
MASTER_SITES= SF
security/mhash/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
MD5 (mhash-0.9.9.tar.bz2) = d113a853e0ac21c49c5a1acea0daaade
SHA256 (mhash-0.9.9.tar.bz2) = 3b14491ba06f6ae8d7755314eb1c82596c422743c5adb5ef65f358313370dc9e
SIZE (mhash-0.9.9.tar.bz2) = 634563
MD5 (mhash-0.9.9.9.tar.bz2) = f91c74f9ccab2b574a98be5bc31eb280
SHA256 (mhash-0.9.9.9.tar.bz2) = 56521c52a9033779154432d0ae47ad7198914785265e1f570cee21ab248dfef0
SIZE (mhash-0.9.9.9.tar.bz2) = 655906
security/mhash/files/patch-doc-Makefile.in
+9 -3
View File
@@ -1,6 +1,12 @@
--- doc/Makefile.in.orig Fri Apr 22 11:43:32 2005
+++ doc/Makefile.in Fri Apr 22 11:44:46 2005
@@ -391,13 +391,13 @@
Description: Fix the GNU-isms in Makefile.in.
This is a BSD-specific patch, the upstream source works fine with GNU make.
Author: Vasil Dimov <vd@datamax.bg>
Forwarded: not-needed
Last-Update: 2009-09-10
--- doc/Makefile.in.orig
+++ doc/Makefile.in
@@ -394,13 +394,13 @@
mhash-doc: $(dist_targets)
$(srcdir)/mhash.html: $(srcdir)/mhash.pod
security/mhash/files/patch-include-mutils-mincludes.h
+8 -4
View File
@@ -1,7 +1,11 @@
diff -urN -x .svn ../../branches/mhash-dist/include/mutils/mincludes.h ./include/mutils/mincludes.h
--- ../../branches/mhash-dist/include/mutils/mincludes.h 2008-01-16 02:34:17.000000000 +0200
+++ ./include/mutils/mincludes.h 2008-01-16 02:35:49.000000000 +0200
@@ -100,20 +100,28 @@
Description: Define the min and max INT constants as needed.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- include/mutils/mincludes.h.orig
+++ include/mutils/mincludes.h
@@ -102,20 +102,28 @@
#include <stdint.h>
#endif
security/mhash/files/patch-include-mutils-mutils.h
+7 -3
View File
@@ -1,6 +1,10 @@
diff -urN -x .svn ../../branches/mhash-dist/include/mutils/mutils.h ./include/mutils/mutils.h
--- ../../branches/mhash-dist/include/mutils/mutils.h 2008-01-16 02:34:17.000000000 +0200
+++ ./include/mutils/mutils.h 2008-01-16 02:42:32.000000000 +0200
Description: Protect some macro parameters with parentheses.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- include/mutils/mutils.h.orig
+++ include/mutils/mutils.h
@@ -103,22 +103,22 @@
#endif
security/mhash/files/patch-lib-gosthash.c
+7 -3
View File
@@ -1,6 +1,10 @@
diff -urN -x .svn ../../branches/vendor/mhash/lib/gosthash.c ./lib/gosthash.c
--- ../../branches/vendor/mhash/lib/gosthash.c 2008-01-16 14:26:51.000000000 +0200
+++ ./lib/gosthash.c 2008-01-16 15:12:01.000000000 +0200
Description: Protect some macro parameters with parentheses.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- lib/gosthash.c.orig
+++ lib/gosthash.c
@@ -273,22 +273,22 @@
*/
security/mhash/files/patch-lib-keygen_mcrypt.c
+8 -3
View File
@@ -1,6 +1,11 @@
diff -urN -x .svn ../../branches/vendor/mhash/lib/keygen_mcrypt.c ./lib/keygen_mcrypt.c
--- ../../branches/vendor/mhash/lib/keygen_mcrypt.c 2008-01-16 14:34:18.000000000 +0200
+++ ./lib/keygen_mcrypt.c 2008-01-16 15:26:44.000000000 +0200
Description: Fix two minor memory leaks.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- lib/keygen_mcrypt.c.orig
+++ lib/keygen_mcrypt.c
@@ -52,8 +52,10 @@
while (1) {
security/mhash/files/patch-lib-md5.c
+7 -3
View File
@@ -1,6 +1,10 @@
diff -urN -x .svn ../../branches/vendor/mhash/lib/md5.c ./lib/md5.c
--- ../../branches/vendor/mhash/lib/md5.c 2008-01-16 14:26:51.000000000 +0200
+++ ./lib/md5.c 2008-01-16 15:11:08.000000000 +0200
Description: Protect some macro parameters with parentheses.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- lib/md5.c.orig
+++ lib/md5.c
@@ -140,14 +140,14 @@
/* The four core functions - F1 is optimized somewhat */
security/mhash/files/patch-lib-mhash.c
+7 -3
View File
@@ -1,6 +1,10 @@
diff -urN -x .svn ../../branches/vendor/mhash/lib/mhash.c ./lib/mhash.c
--- ../../branches/vendor/mhash/lib/mhash.c 2008-01-16 14:26:51.000000000 +0200
+++ ./lib/mhash.c 2008-01-16 15:22:29.000000000 +0200
Description: Fix a bug in checking a memory allocation's result.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- lib/mhash.c.orig
+++ lib/mhash.c
@@ -299,7 +299,7 @@
{
ret->hmac_key = (mutils_word8 *) mutils_malloc(ret->hmac_key_size);
security/mhash/files/patch-lib-mhash_sha1.c
+7 -3
View File
@@ -1,6 +1,10 @@
diff -urN -x .svn ../../branches/vendor/mhash/lib/mhash_sha1.h ./lib/mhash_sha1.h
--- ../../branches/vendor/mhash/lib/mhash_sha1.h 2008-01-16 14:26:51.000000000 +0200
+++ ./lib/mhash_sha1.h 2008-01-16 15:01:05.000000000 +0200
Description: Protect some macro parameters with parentheses.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- lib/mhash_sha1.h.orig
+++ lib/mhash_sha1.h
@@ -39,9 +39,9 @@
#endif
security/mhash/files/patch-lib-ripemd.c
+9 -5
View File
@@ -1,17 +1,21 @@
diff -urN -x .svn ../../branches/vendor/mhash/lib/ripemd.c ./lib/ripemd.c
--- ../../branches/vendor/mhash/lib/ripemd.c 2008-01-16 14:26:51.000000000 +0200
+++ ./lib/ripemd.c 2008-01-16 15:02:04.000000000 +0200
Description: Protect some macro parameters with parentheses.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- lib/ripemd.c.orig
+++ lib/ripemd.c
@@ -55,13 +55,13 @@
/* 32-bit rotate left - kludged with shifts */
#define ROTL(n,X) (((X)<<(n))|((X)>>(32-(n))))
-#define f0(x,y,z) (x^y^z)
+#define f0(x,y,z) ((x)^(y)^(z))
//#define f16(x,y,z) ((x&y)|(~(x) & z))
/* #define f16(x,y,z) ((x&y)|(~(x) & z)) */
#define f16(x,y,z) ((z)^((x)&((y)^(z))))
-#define f32(x,y,z) ((x|~(y))^z)
+#define f32(x,y,z) (((x)|~(y))^(z))
//#define f48(x,y,z) ((x&z)|(y&~(z)))
/* #define f48(x,y,z) ((x&z)|(y&~(z))) */
#define f48(x,y,z) ((y)^((z)&((x)^(y))))
-#define f64(x,y,z) (x^(y|(~z)))
+#define f64(x,y,z) ((x)^((y)|(~(z))))
security/mhash/files/patch-lib-sha1.c
+7 -3
View File
@@ -1,6 +1,10 @@
diff -urN -x .svn ../../branches/vendor/mhash/lib/sha1.c ./lib/sha1.c
--- ../../branches/vendor/mhash/lib/sha1.c 2008-01-16 14:26:51.000000000 +0200
+++ ./lib/sha1.c 2008-01-16 15:00:01.000000000 +0200
Description: Protect some macro parameters with parentheses.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- lib/sha1.c.orig
+++ lib/sha1.c
@@ -59,10 +59,10 @@
save one boolean operation each - thanks to Rich Schroeppel,
rcs@cs.arizona.edu for discovering this */
security/mhash/files/patch-lib-sha512_sha384.c
+7 -3
View File
@@ -1,6 +1,10 @@
diff -urN -x .svn ../../branches/vendor/mhash/lib/sha512_sha384.c ./lib/sha512_sha384.c
--- ../../branches/vendor/mhash/lib/sha512_sha384.c 2008-01-16 14:26:52.000000000 +0200
+++ ./lib/sha512_sha384.c 2008-01-16 14:57:58.000000000 +0200
Description: Protect some macro parameters with parentheses.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- lib/sha512_sha384.c.orig
+++ lib/sha512_sha384.c
@@ -129,13 +129,13 @@
#endif
security/mhash/files/patch-lib-stdfns.c
+58 -54
View File
@@ -1,54 +1,58 @@
diff -urN -x .svn ../../branches/mhash-dist/lib/stdfns.c ./lib/stdfns.c
--- ../../branches/mhash-dist/lib/stdfns.c 2008-01-16 02:34:17.000000000 +0200
+++ ./lib/stdfns.c 2008-01-16 02:35:49.000000000 +0200
@@ -332,11 +332,11 @@
{
return(0);
}
- return(-MAXINT);
+ return(-INT_MAX);
}
if (s2 == NULL)
{
- return(MAXINT);
+ return(INT_MAX);
}
return(memcmp(s1, s2, n));
@@ -463,11 +463,11 @@
{
return(0);
}
- return(-MAXINT);
+ return(-INT_MAX);
}
if (src2 == NULL)
{
- return(MAXINT);
+ return(INT_MAX);
}
return(strcmp((char *) src1, (char *) src2));
}
@@ -486,11 +486,11 @@
{
return(0);
}
- return(-MAXINT);
+ return(-INT_MAX);
}
if (src2 == NULL)
{
- return(MAXINT);
+ return(INT_MAX);
}
return(strncmp((char *) src1, (char *) src2, n));
}
@@ -524,6 +524,8 @@
mutils_word8 *ptrOut = buffer;
mutils_word32 loop;
+ if (buffer == NULL)
+ return(NULL);
for (loop = 0; loop < len; loop++, ptrIn++)
{
*ptrOut++ = mutils_val2char((*ptrIn & 0xf0) >> 4);
Description: Check a memory allocation and use the POSIX INT_* constants.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- lib/stdfns.c.orig
+++ lib/stdfns.c
@@ -360,11 +360,11 @@
{
return(0);
}
- return(-MAXINT);
+ return(-INT_MAX);
}
if (s2 == NULL)
{
- return(MAXINT);
+ return(INT_MAX);
}
return(memcmp(s1, s2, n));
@@ -491,11 +491,11 @@
{
return(0);
}
- return(-MAXINT);
+ return(-INT_MAX);
}
if (src2 == NULL)
{
- return(MAXINT);
+ return(INT_MAX);
}
return(strcmp((char *) src1, (char *) src2));
}
@@ -514,11 +514,11 @@
{
return(0);
}
- return(-MAXINT);
+ return(-INT_MAX);
}
if (src2 == NULL)
{
- return(MAXINT);
+ return(INT_MAX);
}
return(strncmp((char *) src1, (char *) src2, n));
}
@@ -552,6 +552,8 @@
mutils_word8 *ptrOut = buffer;
mutils_word32 loop;
+ if (buffer == NULL)
+ return(NULL);
for (loop = 0; loop < len; loop++, ptrIn++)
{
*ptrOut++ = mutils_val2char((*ptrIn & 0xf0) >> 4);
security/mhash/files/patch-lib-tiger.c
+7 -3
View File
@@ -1,6 +1,10 @@
diff -urN -x .svn ../../branches/vendor/mhash/lib/tiger.c ./lib/tiger.c
--- ../../branches/vendor/mhash/lib/tiger.c 2008-01-16 14:26:51.000000000 +0200
+++ ./lib/tiger.c 2008-01-16 15:08:55.000000000 +0200
Description: Protect some macro parameters with parentheses.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- lib/tiger.c.orig
+++ lib/tiger.c
@@ -62,26 +62,26 @@
#ifdef OPTIMIZE_FOR_ALPHA
/* This is the official definition of round */
security/mhash/files/patch-lib-whirlpool.c
+7 -3
View File
@@ -1,6 +1,10 @@
diff -urN -x .svn ../../branches/vendor/mhash/lib/whirlpool.c ./lib/whirlpool.c
--- ../../branches/vendor/mhash/lib/whirlpool.c 2008-01-16 14:26:51.000000000 +0200
+++ ./lib/whirlpool.c 2008-01-16 15:13:06.000000000 +0200
Description: Protect some macro parameters with parentheses.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- lib/whirlpool.c.orig
+++ lib/whirlpool.c
@@ -883,10 +883,10 @@
* Increment the block counter by step
*/
security/mhash/files/patch-libtool
+9 -3
View File
@@ -1,6 +1,12 @@
--- ltmain.sh.orig Tue May 21 20:44:59 2002
+++ ltmain.sh Tue May 21 20:45:32 2002
@@ -4247,10 +4247,12 @@
Description: Do not install the useless .la file.
This is a FreeBSD-specific patch, upstream doesn't really need it.
Author: Ying-Chieh Liao <ijliao@FreeBSD.org>
Forwarded: not-needed
Last-Update: 2009-09-10
--- ltmain.sh.orig
+++ ltmain.sh
@@ -6003,10 +6003,12 @@
fi
# Install the pseudo-library for information purposes.
security/mhash/files/patch-src-hmac_test.c
+7 -3
View File
@@ -1,6 +1,10 @@
diff -urN -x .svn ../../branches/vendor/mhash/src/hmac_test.c ./src/hmac_test.c
--- ../../branches/vendor/mhash/src/hmac_test.c 2008-01-16 14:34:18.000000000 +0200
+++ ./src/hmac_test.c 2008-01-16 15:33:23.000000000 +0200
Description: Add some failure checks and fix a couple of memory leaks.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- src/hmac_test.c.orig
+++ src/hmac_test.c
@@ -45,10 +45,23 @@
passlen=sizeof(KEY1) - 1;
security/mhash/files/patch-src-keygen_test.c
+7 -3
View File
@@ -1,6 +1,10 @@
diff -urN -x .svn ../../branches/vendor/mhash/src/keygen_test.c ./src/keygen_test.c
--- ../../branches/vendor/mhash/src/keygen_test.c 2008-01-16 14:34:18.000000000 +0200
+++ ./src/keygen_test.c 2008-01-16 15:36:24.000000000 +0200
Description: Add some more failure checks and fix some memory leaks.
Author: Peter Pentchev <roam@FreeBSD.org>
Forwarded: http://sourceforge.net/mailarchive/message.php?msg_name=20090910102100.GA26539%40straylight.m.ringlet.net
Last-Update: 2009-09-10
--- src/keygen_test.c.orig
+++ src/keygen_test.c
@@ -43,6 +43,12 @@
passlen=sizeof(PASSWORD1);