diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-02-11 11:28:08 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-02-11 11:28:08 -0500 |
| commit | 2b4d4ccb3d1ecf984012b39eb361307785b0c1c0 (patch) | |
| tree | 037f87559f31a6804bdf62ab9c948f3138990fae /src/common/crypto.c | |
| parent | d86a45f991693cf2367a6ccb94fc29c22f5f7b45 (diff) | |
| parent | 69ab7cd8281dcb312eb47b738d1c620e7bc042d9 (diff) | |
| download | tor-2b4d4ccb3d1ecf984012b39eb361307785b0c1c0.tar.gz tor-2b4d4ccb3d1ecf984012b39eb361307785b0c1c0.zip | |
Merge remote-tracking branch 'public/bug7801_v2'
Diffstat (limited to 'src/common/crypto.c')
| -rw-r--r-- | src/common/crypto.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/crypto.c b/src/common/crypto.c index 70bd45299f..22d57c7c8a 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -2337,12 +2337,12 @@ crypto_dh_free(crypto_dh_t *dh) (OPENSSL_VERSION_NUMBER >= OPENSSL_V(0,9,8,'c')) /** Set the seed of the weak RNG to a random value. */ -static void -seed_weak_rng(void) +void +crypto_seed_weak_rng(tor_weak_rng_t *rng) { unsigned seed; crypto_rand((void*)&seed, sizeof(seed)); - tor_init_weak_random(seed); + tor_init_weak_random(rng, seed); } /** Try to get <b>out_len</b> bytes of the strongest entropy we can generate, @@ -2426,7 +2426,7 @@ crypto_seed_rng(int startup) } memwipe(buf, 0, sizeof(buf)); - seed_weak_rng(); + if (rand_poll_ok || load_entropy_ok) return 0; else |