security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-03 16:53:03 +01:00
Code Activity

See ChangeLog: Mon Oct 11 09:24:12 CEST 1999 Werner Koch

Browse Source
This commit is contained in:
Werner Koch 1999-10-11 07:26:52 +00:00
parent 06fb4bd4b0
commit 540ddbed50
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
1.0.0e 1.0.0f

4
cipher/ChangeLog
View File

@ -1,3 +1,7 @@
Mon Oct 11 09:24:12 CEST 1999 Werner Koch <wk@gnupg.de>
* rndw32.c (gather_random): Handle PCP_SEEDER_TOO_SMALL.
Sat Oct 9 20:34:41 CEST 1999 Werner Koch <wk@gnupg.de> Sat Oct 9 20:34:41 CEST 1999 Werner Koch <wk@gnupg.de>
* Makefile.am: Tweaked module build and removed libtool * Makefile.am: Tweaked module build and removed libtool

30
cipher/rndw32.c
View File

@ -53,6 +53,17 @@
#define PCP_DLL_FUNC 8 #define PCP_DLL_FUNC 8
#define PCP_UNKNOWN_SEEDER_TYPE 9 #define PCP_UNKNOWN_SEEDER_TYPE 9
/****************
* We sometimes get a SEEDER_TOO_SMALL error, in which case we increment
* the internal buffer by SEEDER_INC_CHUNK until we reach MAX_SEEDER_SIZE
* MAX_SEEDER_SIZE is used as an arbitrary limit to protect against
* bugs in Winseed.
*/
#define MAX_SEEDER_SIZE 500000
#define SEEDER_INC_CHUNK 50000
typedef void *WIN32_SEEDER; typedef void *WIN32_SEEDER;
static WIN32_SEEDER (WINAPI *create_instance)( byte type, unsigned int *reason); static WIN32_SEEDER (WINAPI *create_instance)( byte type, unsigned int *reason);
@ -172,6 +183,25 @@ gather_random( void (*add)(const void*, size_t, int), int requester,
for(;;) { for(;;) {
nbytes = entropy_buffer_size; nbytes = entropy_buffer_size;
result = get_seed( slow_seeder, entropy_buffer, &nbytes); result = get_seed( slow_seeder, entropy_buffer, &nbytes);
if( result == PCP_SEEDER_TOO_SMALL ) {
unsigned int n1 = get_internal_seed_size( slow_seeder );
if( n1 > MAX_SEEDER_SIZE ) {
g10_log_fatal("rndw32: internal seeder problem (size=%u)\n",
n1);
return -1; /* actually never reached */
}
n1 += SEEDER_INC_CHUNK;
set_internal_seed_size( slow_seeder, n1 );
if( n1 > entropy_buffer_size ) {
entropy_buffer_size = n1;
entropy_buffer = m_realloc( entropy_buffer,
entropy_buffer_size );
}
continue;
}
if( result ) { if( result ) {
g10_log_fatal("rndw32: get_seed(slow) failed: rc=%u\n", result); g10_log_fatal("rndw32: get_seed(slow) failed: rc=%u\n", result);
return -1; /* actually never reached */ return -1; /* actually never reached */