diff options
| author | Werner Koch <[email protected]> | 2002-10-21 16:31:17 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2002-10-21 16:31:17 +0000 |
| commit | 265b60b0896c5879af09a9de6e59c1cea312280c (patch) | |
| tree | 4f61c28e97718a0c00027559c84b6c9acaaf49ec | |
| parent | * configure.ac (try_gettext): Remove special case for cygwin. (diff) | |
| download | gnupg-265b60b0896c5879af09a9de6e59c1cea312280c.tar.gz gnupg-265b60b0896c5879af09a9de6e59c1cea312280c.zip | |
* rndw32.c [__CYGWIN32__]: Don't include winioctl.h - it is not
required anymore.
* random.c (read_seed_file,update_random_seed_file): Use binary
mode for __CYGWIN__.
| -rw-r--r-- | cipher/ChangeLog | 8 | ||||
| -rw-r--r-- | cipher/random.c | 16 | ||||
| -rw-r--r-- | cipher/rndw32.c | 3 |
3 files changed, 16 insertions, 11 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 6d68c21da..dd0c442ec 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,11 @@ +2002-10-21 Werner Koch <[email protected]> + + * rndw32.c [__CYGWIN32__]: Don't include winioctl.h - it is not + required anymore. + + * random.c (read_seed_file,update_random_seed_file): Use binary + mode for __CYGWIN__. + 2002-10-12 Werner Koch <[email protected]> * rndunix.c (my_popen): Make sure that stdin and stderr are diff --git a/cipher/random.c b/cipher/random.c index c2dea9c28..faf664ac1 100644 --- a/cipher/random.c +++ b/cipher/random.c @@ -311,9 +311,9 @@ mix_pool(byte *pool) RMD160_CONTEXT md; rmd160_init( &md ); - #if DIGESTLEN != 20 +#if DIGESTLEN != 20 #error must have a digest length of 20 for ripe-md-160 - #endif +#endif /* loop over the pool */ pend = pool + POOLSIZE; memcpy(hashbuf, pend - DIGESTLEN, DIGESTLEN ); @@ -367,11 +367,11 @@ read_seed_file(void) if( !seed_file_name ) return 0; - #ifdef HAVE_DOSISH_SYSTEM +#if defined(HAVE_DOSISH_SYSTEM) || defined(__CYGWIN__) fd = open( seed_file_name, O_RDONLY | O_BINARY ); - #else +#else fd = open( seed_file_name, O_RDONLY ); - #endif +#endif if( fd == -1 && errno == ENOENT) { allow_seed_file_update = 1; return 0; @@ -457,12 +457,12 @@ update_random_seed_file() mix_pool(rndpool); rndstats.mixrnd++; mix_pool(keypool); rndstats.mixkey++; - #ifdef HAVE_DOSISH_SYSTEM +#if defined(HAVE_DOSISH_SYSTEM) || defined(__CYGWIN__) fd = open( seed_file_name, O_WRONLY|O_CREAT|O_TRUNC|O_BINARY, S_IRUSR|S_IWUSR ); - #else +#else fd = open( seed_file_name, O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR ); - #endif +#endif if( fd == -1 ) { log_info(_("can't create `%s': %s\n"), seed_file_name, strerror(errno) ); return; diff --git a/cipher/rndw32.c b/cipher/rndw32.c index c5f855ca6..4ed4f772f 100644 --- a/cipher/rndw32.c +++ b/cipher/rndw32.c @@ -70,9 +70,6 @@ #include <string.h> #include <windows.h> -#ifdef __CYGWIN32__ -# include <winioctl.h> -#endif #include "types.h" |