diff options
author | Werner Koch <wk@gnupg.org> | 2006-10-05 08:01:11 +0000 |
---|---|---|
committer | Werner Koch <wk@gnupg.org> | 2006-10-05 08:01:11 +0000 |
commit | 74f7c8dd7320783f0d294e32b526186f366e0c01 (patch) | |
tree | dd02b9e20ebb8109b0d466822c5ef9935db4bb34 /cipher | |
parent | 514c81214ca86a3aa1ec2e0523e407acd7e7d0b5 (diff) | |
download | libgcrypt-74f7c8dd7320783f0d294e32b526186f366e0c01.tar.gz |
fix gcc4 warning (David) and other collected fixes.
Diffstat (limited to 'cipher')
-rw-r--r-- | cipher/ChangeLog | 16 | ||||
-rw-r--r-- | cipher/pubkey.c | 3 | ||||
-rw-r--r-- | cipher/rndw32.c | 2 | ||||
-rw-r--r-- | cipher/tiger.c | 18 |
4 files changed, 28 insertions, 11 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index b35e8f56..d4be5624 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,19 @@ +2006-10-04 David Shaw <dshaw@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@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@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@FreeBSD.org> (wk) * seed.c: New. diff --git a/cipher/pubkey.c b/cipher/pubkey.c index c2efdfc4..60aabdd1 100644 --- a/cipher/pubkey.c +++ b/cipher/pubkey.c @@ -1265,8 +1265,9 @@ sexp_data_to_mpi (gcry_sexp_t input, unsigned int nbits, gcry_mpi_t *ret_mpi, static struct { const char *name; int algo; } hashnames[] = { { "sha1", GCRY_MD_SHA1 }, { "md5", GCRY_MD_MD5 }, - { "rmd160", GCRY_MD_RMD160 }, { "sha256", GCRY_MD_SHA256 }, + { "ripemd160", GCRY_MD_RMD160 }, + { "rmd160", GCRY_MD_RMD160 }, { "sha384", GCRY_MD_SHA384 }, { "sha512", GCRY_MD_SHA512 }, { "md2", GCRY_MD_MD2 }, diff --git a/cipher/rndw32.c b/cipher/rndw32.c index e20f6c52..994fdb15 100644 --- a/cipher/rndw32.c +++ b/cipher/rndw32.c @@ -398,7 +398,7 @@ slow_gatherer_windowsNT( void (*add)(const void*, size_t, int), int requester ) /* 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 ) diff --git a/cipher/tiger.c b/cipher/tiger.c index 1a811bc4..067521bf 100644 --- a/cipher/tiger.c +++ b/cipher/tiger.c @@ -600,7 +600,7 @@ tiger_init( void *context ) } 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 @@ pass( u64 *ra, u64 *rb, u64 *rc, u64 *x, int mul ) 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; |