diff options
| author | Werner Koch <[email protected]> | 2002-02-14 11:47:32 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2002-02-14 11:47:32 +0000 |
| commit | 05705bcb1c1dffa544e349e8229638c86d25ef68 (patch) | |
| tree | 5b97110ddd0b6671623b104d2feecb4de48cc776 | |
| parent | Bug fix - properly handle user IDs with colons (":") in them while HKP (diff) | |
| download | gnupg-05705bcb1c1dffa544e349e8229638c86d25ef68.tar.gz gnupg-05705bcb1c1dffa544e349e8229638c86d25ef68.zip | |
* random.c (mix_pool): Removed the failsafe stuff again. It makes
the code more complicate and may give the path to more bugs.
| -rw-r--r-- | cipher/ChangeLog | 5 | ||||
| -rw-r--r-- | cipher/random.c | 16 |
2 files changed, 6 insertions, 15 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 9e0de9aea..27c64b621 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,8 @@ +2002-02-14 Werner Koch <[email protected]> + + * random.c (mix_pool): Removed the failsafe stuff again. It makes + the code more complicate and may give the path to more bugs. + 2002-02-10 Werner Koch <[email protected]> * random.c (mix_pool): Carry an extra failsafe_digest buffer diff --git a/cipher/random.c b/cipher/random.c index c263f7d68..8c552bd3b 100644 --- a/cipher/random.c +++ b/cipher/random.c @@ -57,7 +57,6 @@ #include "random.h" #include "rand-internal.h" #include "dynload.h" -#include "cipher.h" /* only used for the rmd160_hash_buffer() prototype */ #ifndef RAND_MAX /* for SunOS */ @@ -101,9 +100,6 @@ static int did_initial_extra_seeding; static char *seed_file_name; static int allow_seed_file_update; -static unsigned char failsafe_digest[DIGESTLEN]; -static int failsafe_digest_valid; - static int secure_alloc; static int quick_test; static int faked_rng; @@ -263,11 +259,6 @@ mix_pool(byte *pool) memcpy(hashbuf+DIGESTLEN, pool, BLOCKLEN-DIGESTLEN); rmd160_mixblock( &md, hashbuf); memcpy(pool, hashbuf, 20 ); - if (failsafe_digest_valid && (char*)pool == rndpool) - { - for (i=0; i < 20; i++) - pool[i] ^= failsafe_digest[i]; - } p = pool; for( n=1; n < POOLBLOCKS; n++ ) { @@ -288,12 +279,7 @@ mix_pool(byte *pool) rmd160_mixblock( &md, hashbuf); memcpy(p, hashbuf, 20 ); } - if ((char*)pool == rndpool) - { - rmd160_hash_buffer (failsafe_digest, pool, POOLSIZE); - failsafe_digest_valid = 1; - } - burn_stack (384); /* for the rmd160_mixblock(), rmd160_hash_buffer */ + burn_stack (384); /* for the rmd160_mixblock() */ } |