commit ed02a409cfdd51671ff1d80c86cfc7d6458f201f Merge: 32bd533 e9677c8 Author: Nick Mathewson nickm@torproject.org Date: Wed May 20 15:33:22 2015 -0400

Merge branch 'bug16034_no_more_openssl_098_squashed'

Conflicts: src/test/testing_common.c

changes/ticket16034 | 6 + src/common/aes.c | 28 +---- src/common/crypto.c | 48 +++----- src/common/crypto.h | 2 +- src/common/tortls.c | 300 ++++++++++++++++++++++----------------------- src/common/tortls.h | 2 +- src/or/main.c | 15 +-- src/test/bench.c | 5 +- src/test/test_crypto.c | 2 +- src/test/test_workqueue.c | 2 +- src/test/testing_common.c | 2 +- src/tools/tor-gencert.c | 2 +- 12 files changed, 190 insertions(+), 224 deletions(-)

diff --cc src/or/main.c index 3fb7de6,3f785a2..74e6b33 --- a/src/or/main.c +++ b/src/or/main.c @@@ -1333,10 -1314,10 +1333,10 @@@ run_scheduled_events(time_t now * connection_run_housekeeping() above. */ }

- if (time_to_add_entropy < now) { - if (time_to_add_entropy) { + if (time_to.add_entropy < now) { + if (time_to.add_entropy) { /* We already seeded once, so don't die on failure. */ - crypto_seed_rng(0); + crypto_seed_rng(); } /** How often do we add more entropy to OpenSSL's RNG pool? */ #define ENTROPY_INTERVAL (60*60) diff --cc src/test/testing_common.c index 60be460,e0c0046..7f387c0 --- a/src/test/testing_common.c +++ b/src/test/testing_common.c @@@ -269,8 -269,8 +269,8 @@@ main(int c, const char **v printf("Can't initialize crypto subsystem; exiting.\n"); return 1; } - crypto_set_tls_dh_prime(NULL); + crypto_set_tls_dh_prime(); - crypto_seed_rng(1); + crypto_seed_rng(); rep_hist_init(); network_init(); setup_directory();