diff options
| author | Moritz Schulte <mo@g10code.com> | 2003-10-27 10:48:47 +0000 |
|---|---|---|
| committer | Moritz Schulte <mo@g10code.com> | 2003-10-27 10:48:47 +0000 |
| commit | 5733ae5616a765660408683ec6dca22c912e11ae (patch) | |
| tree | a36577ff31796bff58ee54e6948f3060595b616a | |
| parent | ee2eeb6b3da5b1c4a3c812dd14f91d9d1a03201f (diff) | |
| download | libgcrypt-5733ae5616a765660408683ec6dca22c912e11ae.tar.gz | |
2003-10-24 Moritz Schulte <mo@g10code.com>
* rndw32.c: Removed IS_MODULE -cruft.
* rndlinux.c (rndlinux_gather_random): Likewise.
| -rw-r--r-- | cipher/rndlinux.c | 13 | ||||
| -rw-r--r-- | cipher/rndw32.c | 9 |
2 files changed, 3 insertions, 19 deletions
diff --git a/cipher/rndlinux.c b/cipher/rndlinux.c index cc96fa1f..3cfcb453 100644 --- a/cipher/rndlinux.c +++ b/cipher/rndlinux.c @@ -122,17 +122,10 @@ rndlinux_gather_random( void (*add)(const void*, size_t, int), int requester, if( !(rc=select(fd+1, &rfds, NULL, NULL, &tv)) ) { if( !warn ) { -#ifndef IS_MODULE _gcry_random_progress ("need_entropy", 'X', 0, (int)length); -#else - log_info (_("not enough random bytes available (need %d bytes)\n"), - (int)length); - - log_info (_("please do some other work to give the OS a chance to collect more entropy\n")); -#endif - } - warn = 1; - continue; + warn = 1; + } + continue; } else if( rc == -1 ) { log_error ("select() error: %s\n", strerror(errno)); diff --git a/cipher/rndw32.c b/cipher/rndw32.c index d7f4ffd2..21d0af6a 100644 --- a/cipher/rndw32.c +++ b/cipher/rndw32.c @@ -62,15 +62,6 @@ * easier to maintain and */ /*#define USE_ENTROPY_DLL*/ - - -#ifdef IS_MODULE -#define _(a) (a) -#else -/*#include "i18n.h"*/ -#endif - - static int debug_me; #ifdef USE_ENTROPY_DLL |