rpms/mcrypt/F-8 mcrypt-rfc2440-bugfixes.patch, NONE, 1.1 mcrypt.spec, 1.5, 1.6 sources, 1.3, 1.4

[Tom Callaway (spot)]

Author: spot

Update of /cvs/extras/rpms/mcrypt/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4435/F-8

Modified Files:
	mcrypt.spec sources 
Added Files:
	mcrypt-rfc2440-bugfixes.patch 
Log Message:

Update to 2.6.7
License change to GPLv3+
Fix rfc2440 bugs


mcrypt-rfc2440-bugfixes.patch:

--- NEW FILE mcrypt-rfc2440-bugfixes.patch ---
diff -up mcrypt-2.6.7/src/rfc2440.c.BAD mcrypt-2.6.7/src/rfc2440.c
--- mcrypt-2.6.7/src/rfc2440.c.BAD	2007-12-17 06:37:19.000000000 -0500
+++ mcrypt-2.6.7/src/rfc2440.c	2007-12-17 06:38:22.000000000 -0500
@@ -405,7 +405,7 @@ length_decode(const uchar *buf, int pos,
         len += (buf[pos+1] + 192);
     }
     else if (buf[pos] == 255) {
-        len += (buf[pos+1] << 24);
+        len = (buf[pos+1] << 24);
         len += (buf[pos+2] << 16);
         len += (buf[pos+3] << 8);
         len += buf[pos+4];
@@ -662,7 +662,7 @@ symkey_enc_encode(const DEK *dek)
 {
     USTRING result;
     int pos = 0;
-    uchar buf[13];
+    uchar buf[15];
 
     assert(dek->keylen > 0);
 


Index: mcrypt.spec
===================================================================
RCS file: /cvs/extras/rpms/mcrypt/F-8/mcrypt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mcrypt.spec	24 Aug 2007 14:42:49 -0000	1.5
+++ mcrypt.spec	17 Dec 2007 11:52:31 -0000	1.6
@@ -1,11 +1,12 @@
 Name:		mcrypt
-Version:	2.6.6
-Release:	2%{?dist}
-License:	GPLv2+
+Version:	2.6.7
+Release:	1%{?dist}
+License:	GPLv3+
 Group:		Applications/System
 Summary:	Replacement for crypt()
 URL:		http://mcrypt.sourceforge.net/
 Source0:	http://download.sourceforge.net/mcrypt/mcrypt-%{version}.tar.gz
+Patch0:		mcrypt-rfc2440-bugfixes.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libmcrypt-devel, mhash-devel, gettext, zlib-devel
 
@@ -17,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure
@@ -38,6 +40,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Dec 17 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.7-1
+- 2.6.7
+- fix bugs in rfc2440.c (resolves bugzilla 418481)
+
 * Fri Aug 24 2007 Tom "spot" Callaway <tcallawa at redhat.com> 2.6.6-2
 - rebuild for ppc32, license fix
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mcrypt/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	20 Jul 2007 01:44:27 -0000	1.3
+++ sources	17 Dec 2007 11:52:31 -0000	1.4
@@ -1 +1 @@
-cd1a6919e56fc86b3aa33055d3dbeb4f  mcrypt-2.6.6.tar.gz
+ca202566d1a336a87266021e97563c81  mcrypt-2.6.7.tar.gz