[svn] gcry - r1179 - trunk/cipher

[svn author wk]

Author: wk
Date: 2006-10-05 10:01:11 +0200 (Thu, 05 Oct 2006)
New Revision: 1179

Modified:
   trunk/cipher/ChangeLog
   trunk/cipher/pubkey.c
   trunk/cipher/rndw32.c
   trunk/cipher/tiger.c
Log:
fix gcc4 warning (David) and other collected fixes.


Modified: trunk/cipher/ChangeLog
===================================================================
--- trunk/cipher/ChangeLog	2006-08-29 10:21:09 UTC (rev 1178)
+++ trunk/cipher/ChangeLog	2006-10-05 08:01:11 UTC (rev 1179)
@@ -1,3 +1,19 @@
+2006-10-04  David Shaw  <dshaw at jabberwocky.com>  (wk)
+ 
+	* tiger.c (round): Rename to tiger_round as gcc 4 has a built-in
+	round function that this conflicts with.
+ 
+2006-09-11  Werner Koch  <wk at g10code.com>
+
+	* rndw32.c (slow_gatherer_windowsNT): While adding data use the
+	size of the diskPerformance and not its address. Has been fixed in
+	GnuPG more than a year ago.  Noted by Lee Fisher.
+
+2006-08-30  Werner Koch  <wk at g10code.com>
+
+	* pubkey.c (sexp_data_to_mpi): Need to allow "ripemd160" here as
+	this is the canonical name.
+
 2006-08-29  Hye-Shik Chang <perky at FreeBSD.org>  (wk)
 
 	* seed.c: New.

Modified: trunk/cipher/pubkey.c
===================================================================
--- trunk/cipher/pubkey.c	2006-08-29 10:21:09 UTC (rev 1178)
+++ trunk/cipher/pubkey.c	2006-10-05 08:01:11 UTC (rev 1179)
@@ -1265,8 +1265,9 @@
           static struct { const char *name; int algo; } hashnames[] = 
           { { "sha1",   GCRY_MD_SHA1 },
             { "md5",    GCRY_MD_MD5 },
+            { "sha256", GCRY_MD_SHA256 },
+            { "ripemd160", GCRY_MD_RMD160 },
             { "rmd160", GCRY_MD_RMD160 },
-            { "sha256", GCRY_MD_SHA256 },
             { "sha384", GCRY_MD_SHA384 },
             { "sha512", GCRY_MD_SHA512 },
             { "md2",    GCRY_MD_MD2 },

Modified: trunk/cipher/rndw32.c
===================================================================
--- trunk/cipher/rndw32.c	2006-08-29 10:21:09 UTC (rev 1178)
+++ trunk/cipher/rndw32.c	2006-10-05 08:01:11 UTC (rev 1179)
@@ -398,7 +398,7 @@
 	/* Note: This only works if you have turned on the disk performance
 	 * counters with 'diskperf -y'.  These counters are off by default */
 	if (DeviceIoControl (hDevice, IOCTL_DISK_PERFORMANCE, NULL, 0,
-			     &diskPerformance, SIZEOF_DISK_PERFORMANCE_STRUCT,
+			     diskPerformance, SIZEOF_DISK_PERFORMANCE_STRUCT,
 			     &dwSize, NULL))
 	{
 	    if ( debug_me )

Modified: trunk/cipher/tiger.c
===================================================================
--- trunk/cipher/tiger.c	2006-08-29 10:21:09 UTC (rev 1178)
+++ trunk/cipher/tiger.c	2006-10-05 08:01:11 UTC (rev 1179)
@@ -600,7 +600,7 @@
 }
 
 static void
-round( u64 *ra, u64 *rb, u64 *rc, u64 x, int mul )
+tiger_round( u64 *ra, u64 *rb, u64 *rc, u64 x, int mul )
 {
   u64 a = *ra;
   u64 b = *rb;
@@ -626,14 +626,14 @@
   u64 b = *rb;
   u64 c = *rc;
 
-  round( &a, &b, &c, x[0], mul );
-  round( &b, &c, &a, x[1], mul );
-  round( &c, &a, &b, x[2], mul );
-  round( &a, &b, &c, x[3], mul );
-  round( &b, &c, &a, x[4], mul );
-  round( &c, &a, &b, x[5], mul );
-  round( &a, &b, &c, x[6], mul );
-  round( &b, &c, &a, x[7], mul );
+  tiger_round( &a, &b, &c, x[0], mul );
+  tiger_round( &b, &c, &a, x[1], mul );
+  tiger_round( &c, &a, &b, x[2], mul );
+  tiger_round( &a, &b, &c, x[3], mul );
+  tiger_round( &b, &c, &a, x[4], mul );
+  tiger_round( &c, &a, &b, x[5], mul );
+  tiger_round( &a, &b, &c, x[6], mul );
+  tiger_round( &b, &c, &a, x[7], mul );
 
   *ra = a;
   *rb = b;