LIBGCRYPT-1-2-BRANCH libgcrypt/cipher (ChangeLog rndw32.c)

[cvs user wk]

    Date: Wednesday, March 23, 2005 @ 09:52:21
  Author: wk
    Path: /cvs/libgcrypt/libgcrypt/cipher
     Tag: LIBGCRYPT-1-2-BRANCH

Modified: ChangeLog rndw32.c

(_gcry_rndw32_gather_random_fast): While adding data
use the size of the object and not the one of its address.  Bug
reported by Sascha Kiefer.


-----------+
 ChangeLog |    8 +++++++-
 rndw32.c  |    9 +++++----
 2 files changed, 12 insertions(+), 5 deletions(-)


Index: libgcrypt/cipher/ChangeLog
diff -u libgcrypt/cipher/ChangeLog:1.211.2.10 libgcrypt/cipher/ChangeLog:1.211.2.11
--- libgcrypt/cipher/ChangeLog:1.211.2.10	Sat Mar 19 18:58:13 2005
+++ libgcrypt/cipher/ChangeLog	Wed Mar 23 09:52:21 2005
@@ -1,3 +1,9 @@
+2005-03-23  Werner Koch  <wk at g10code.com>
+
+	* rndw32.c (_gcry_rndw32_gather_random_fast): While adding data
+	use the size of the object and not the one of its address.  Bug
+	reported by Sascha Kiefer.
+
 2005-03-19  Moritz Schulte  <moritz at g10code.com>
 
 	* cipher.c (do_cbc_encrypt): Be careful to not overwrite data,
@@ -2837,7 +2843,7 @@
 	(digest_algo_to_string): New.
 
 
- Copyright 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
+ Copyright 1998,1999,2000,2001,2002,2003,2005 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
Index: libgcrypt/cipher/rndw32.c
diff -u libgcrypt/cipher/rndw32.c:1.17 libgcrypt/cipher/rndw32.c:1.17.2.1
--- libgcrypt/cipher/rndw32.c:1.17	Thu Dec 11 16:46:12 2003
+++ libgcrypt/cipher/rndw32.c	Wed Mar 23 09:52:21 2005
@@ -635,13 +635,14 @@
 	(*add) ( &kernelTime, sizeof (kernelTime), requester );
 	(*add) ( &userTime, sizeof (userTime), requester );
 
-	/* Get the minimum and maximum working set size for the current process */
+	/* Get the minimum and maximum working set size for the
+           current process */
 	GetProcessWorkingSetSize (handle, &minimumWorkingSetSize,
 					  &maximumWorkingSetSize);
 	(*add) ( &minimumWorkingSetSize,
-				   sizeof (&minimumWorkingSetSize), requester );
+				   sizeof (minimumWorkingSetSize), requester );
 	(*add) ( &maximumWorkingSetSize,
-				   sizeof (&maximumWorkingSetSize), requester );
+				   sizeof (maximumWorkingSetSize), requester );
     }
 
 
@@ -669,7 +670,7 @@
 	if (QueryPerformanceCounter (&performanceCount)) {
 	    if ( debug_me )
 		log_debug ("rndw32#gather_random_fast: perf data\n");
-	    (*add) (&performanceCount, sizeof (&performanceCount), requester);
+	    (*add) (&performanceCount, sizeof (performanceCount), requester);
 	}
 	else { /* Millisecond accuracy at best... */
 	    DWORD aword = GetTickCount ();