rpms/libmcrypt/F-9 libmcrypt-2.5.8-prototypes.patch, NONE, 1.1 libmcrypt-2.5.8-uninitialized.patch, NONE, 1.1 libmcrypt.spec, 1.10, 1.11

[Tom Callaway]

Author: spot

Update of /cvs/extras/rpms/libmcrypt/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8271/F-9

Modified Files:
	libmcrypt.spec 
Added Files:
	libmcrypt-2.5.8-prototypes.patch 
	libmcrypt-2.5.8-uninitialized.patch 
Log Message:
push fixes to active branches

libmcrypt-2.5.8-prototypes.patch:

--- NEW FILE libmcrypt-2.5.8-prototypes.patch ---
diff -up libmcrypt-2.5.8/modules/algorithms/des.c.BAD libmcrypt-2.5.8/modules/algorithms/des.c
--- libmcrypt-2.5.8/modules/algorithms/des.c.BAD	2008-08-25 17:40:29.000000000 -0400
+++ libmcrypt-2.5.8/modules/algorithms/des.c	2008-08-25 17:40:51.000000000 -0400
@@ -35,9 +35,12 @@
 
 /* #define	NULL	0 */
 
-static void permute_ip(), permute_fp(), perminit_ip(), spinit(),
-perminit_fp();
-static word32 f();
+static void permute_ip(char *, DES_KEY *, char *);
+static void permute_fp(char *, DES_KEY *, char *);
+static void perminit_ip(DES_KEY *);
+static void spinit(DES_KEY *);
+static void perminit_fp(DES_KEY *);
+static word32 f(DES_KEY *, register word32, register char *);
 
 
 /* Tables defined in the Data Encryption Standard documents */
diff -up libmcrypt-2.5.8/modules/algorithms/tripledes.c.BAD libmcrypt-2.5.8/modules/algorithms/tripledes.c
--- libmcrypt-2.5.8/modules/algorithms/tripledes.c.BAD	2008-08-25 17:40:56.000000000 -0400
+++ libmcrypt-2.5.8/modules/algorithms/tripledes.c	2008-08-25 17:41:13.000000000 -0400
@@ -36,8 +36,10 @@
 
 /* #define	NULL	0 */
 
-static void permute(), perminit(), spinit();
-static word32 f();
+static void permute(char *, char[16][16][8], char *);
+static void perminit(char[16][16][8], char[64]);
+static void spinit(TRIPLEDES_KEY *, int);
+static word32 f(TRIPLEDES_KEY *, int, register word32, register char *);
 
 
 /* Tables defined in the Data Encryption Standard documents */

libmcrypt-2.5.8-uninitialized.patch:

--- NEW FILE libmcrypt-2.5.8-uninitialized.patch ---
diff -up libmcrypt-2.5.8/modules/algorithms/twofish.c.BAD libmcrypt-2.5.8/modules/algorithms/twofish.c
--- libmcrypt-2.5.8/modules/algorithms/twofish.c.BAD	2008-08-25 17:38:21.000000000 -0400
+++ libmcrypt-2.5.8/modules/algorithms/twofish.c	2008-08-25 17:38:30.000000000 -0400
@@ -499,7 +499,7 @@ static void f_rnd(int i, word32* blk, TW
 /* encrypt a block of text  */
 WIN32DLL_DEFINE void _mcrypt_encrypt(TWI * pkey, word32 * in_blk)
 {
-	word32 t0, t1, blk[4];
+	word32 t0 = 0, t1 = 0, blk[4];
 #ifdef WORDS_BIGENDIAN
 	blk[0] = byteswap32(in_blk[0]) ^ pkey->l_key[0];
 	blk[1] = byteswap32(in_blk[1]) ^ pkey->l_key[1];


Index: libmcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/libmcrypt/F-9/libmcrypt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libmcrypt.spec	20 Feb 2008 01:17:52 -0000	1.10
+++ libmcrypt.spec	26 Aug 2008 12:40:10 -0000	1.11
@@ -1,12 +1,18 @@
 Name:		libmcrypt
 Version:	2.5.8
-Release:	5%{?dist}
+Release:	6%{?dist}
 License:	LGPLv2+
 Group:		System Environment/Libraries
 Summary:	Encryption algorithms library
 URL:		http://mcrypt.sourceforge.net/
 Source0:	http://download.sourceforge.net/mcrypt/libmcrypt-%{version}.tar.gz
 Patch0:		libmcrypt-2.5.8-nolibltdl.patch
+# Upstream:
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1872801&group_id=87941&atid=584895
+Patch1:		libmcrypt-2.5.8-uninitialized.patch
+# Upstream:
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1872799&group_id=87941&atid=584895
+Patch2:		libmcrypt-2.5.8-prototypes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libtool-ltdl-devel
 
@@ -26,6 +32,8 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .uninitialized
+%patch2 -p1 -b .prototypes
 
 %build
 %configure
@@ -61,6 +69,9 @@
 %{_datadir}/aclocal/libmcrypt.m4
 
 %changelog
+* Tue Aug 26 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.5.8-6
+- apply minor cleanups from upstream
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.5.8-5
 - Autorebuild for GCC 4.3