diff options
| author | Werner Koch <[email protected]> | 1999-05-23 12:29:05 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 1999-05-23 12:29:05 +0000 |
| commit | c7447e78e2abb1298fecb9861fe420109c91f14f (patch) | |
| tree | b7a7954789898fc3cac24f43cbd0d32ec139f9f2 /cipher | |
| parent | See ChangeLog: Sat May 22 22:47:26 CEST 1999 Werner Koch (diff) | |
| download | gnupg-c7447e78e2abb1298fecb9861fe420109c91f14f.tar.gz gnupg-c7447e78e2abb1298fecb9861fe420109c91f14f.zip | |
See ChangeLog: Sun May 23 14:20:22 CEST 1999 Werner Koch
Diffstat (limited to 'cipher')
| -rw-r--r-- | cipher/ChangeLog | 6 | ||||
| -rw-r--r-- | cipher/cipher.c | 2 | ||||
| -rw-r--r-- | cipher/random.c | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index e755d022b..b2fc6401c 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,9 @@ +Sun May 23 14:20:22 CEST 1999 Werner Koch <[email protected]> + + * cipher.c (setup_cipher_table): Enable Twofish + + * random.c (fast_random_poll): Disable use of times() for mingw32. + Mon May 17 21:54:43 CEST 1999 Werner Koch <[email protected]> * dynload.c (register_internal_cipher_extension): Minor init fix. diff --git a/cipher/cipher.c b/cipher/cipher.c index c3712f985..a44dcc4a7 100644 --- a/cipher/cipher.c +++ b/cipher/cipher.c @@ -83,7 +83,6 @@ setup_cipher_table(void) int i; i = 0; - if( getenv("GNUPG_ENABLE_TWOFISH") ) { cipher_table[i].algo = CIPHER_ALGO_TWOFISH; cipher_table[i].name = twofish_get_info( cipher_table[i].algo, &cipher_table[i].keylen, @@ -95,7 +94,6 @@ setup_cipher_table(void) if( !cipher_table[i].name ) BUG(); i++; - } cipher_table[i].algo = CIPHER_ALGO_BLOWFISH; cipher_table[i].name = blowfish_get_info( cipher_table[i].algo, &cipher_table[i].keylen, diff --git a/cipher/random.c b/cipher/random.c index eb4fdf793..5fa45ea86 100644 --- a/cipher/random.c +++ b/cipher/random.c @@ -360,10 +360,12 @@ fast_random_poll() add_randomness( &tv.tv_usec, sizeof(tv.tv_usec), 1 ); } #else /* use times */ + #ifndef HAVE_DOSISH_SYSTEM { struct tms buf; times( &buf ); add_randomness( &buf, sizeof buf, 1 ); } + #endif #endif #ifdef HAVE_GETRUSAGE { struct rusage buf; |