security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-13 18:21:03 +02:00
Code Activity

(rndw32_gather_random_fast): While adding data use the

Browse Source 
size of the object and not the one of its address.  Bug reported by
Sascha Kiefer.
This commit is contained in:
Werner Koch 2005-03-23 08:50:27 +00:00
parent 1517f0e945
commit 4d5285ee87
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cipher/ChangeLog
View File

@ -1,3 +1,9 @@
2005-03-23 Werner Koch <wk@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@g10code.com> 2005-03-07 Werner Koch <wk@g10code.com>
* primegen.c (is_prime): Free A2. Noted by pmike2001@mail.ru. * primegen.c (is_prime): Free A2. Noted by pmike2001@mail.ru.
@ -1212,7 +1218,7 @@ Mon Feb 16 10:08:47 1998 Werner Koch (wk@isil.d.shuttle.de)
Copyright 1998, 1999, 2000, 2001, 2002, 2003, 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 This file is free software; as a special exception the author gives
unlimited permission to copy and/or distribute it, with or without unlimited permission to copy and/or distribute it, with or without

9
cipher/rndw32.c
View File

@ -654,13 +654,14 @@ rndw32_gather_random_fast( void (*add)(const void*, size_t, int), int requester
(*add) ( &kernelTime, sizeof (kernelTime), requester ); (*add) ( &kernelTime, sizeof (kernelTime), requester );
(*add) ( &userTime, sizeof (userTime), 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, GetProcessWorkingSetSize (handle, &minimumWorkingSetSize,
&maximumWorkingSetSize); &maximumWorkingSetSize);
(*add) ( &minimumWorkingSetSize, (*add) ( &minimumWorkingSetSize,
sizeof (&minimumWorkingSetSize), requester ); sizeof (minimumWorkingSetSize), requester );
(*add) ( &maximumWorkingSetSize, (*add) ( &maximumWorkingSetSize,
sizeof (&maximumWorkingSetSize), requester ); sizeof (maximumWorkingSetSize), requester );
} }
@ -688,7 +689,7 @@ rndw32_gather_random_fast( void (*add)(const void*, size_t, int), int requester
if (QueryPerformanceCounter (&performanceCount)) { if (QueryPerformanceCounter (&performanceCount)) {
if ( debug_me ) if ( debug_me )
log_debug ("rndw32#gather_random_fast: perf data\n"); log_debug ("rndw32#gather_random_fast: perf data\n");
(*add) (&performanceCount, sizeof (&performanceCount), requester); (*add) (&performanceCount, sizeof (performanceCount), requester);
} }
else { /* Millisecond accuracy at best... */ else { /* Millisecond accuracy at best... */
DWORD aword = GetTickCount (); DWORD aword = GetTickCount ();