gnupg/cipher (ChangeLog rndw32.c)

[cvs user wk]

    Date: Wednesday, March 23, 2005 @ 09:50:27
  Author: wk
    Path: /cvs/gnupg/gnupg/cipher

Modified: ChangeLog rndw32.c

(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: gnupg/cipher/ChangeLog
diff -u gnupg/cipher/ChangeLog:1.147 gnupg/cipher/ChangeLog:1.148
--- gnupg/cipher/ChangeLog:1.147	Mon Mar  7 14:59:59 2005
+++ gnupg/cipher/ChangeLog	Wed Mar 23 09:50:27 2005
@@ -1,3 +1,9 @@
+2005-03-23  Werner Koch  <wk at g10code.com>
+
+	* rndw32.c (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-07  Werner Koch  <wk at g10code.com>
 
 	* primegen.c (is_prime): Free A2.  Noted by pmike2001 at mail.ru.
@@ -1212,7 +1218,7 @@
 
 
  Copyright 1998, 1999, 2000, 2001, 2002, 2003,
-	   2004 Free Software Foundation, Inc.
+	   2004, 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: gnupg/cipher/rndw32.c
diff -u gnupg/cipher/rndw32.c:1.11 gnupg/cipher/rndw32.c:1.12
--- gnupg/cipher/rndw32.c:1.11	Sat May 24 20:31:33 2003
+++ gnupg/cipher/rndw32.c	Wed Mar 23 09:50:27 2005
@@ -654,13 +654,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 );
     }
 
 
@@ -688,7 +689,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 ();