From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 20 May 2015 19:33:22 +0000 (-0400)
Subject: Merge branch 'bug16034_no_more_openssl_098_squashed'
X-Git-Tag: tor-0.2.7.2-alpha~148
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ed02a409cfdd51671ff1d80c86cfc7d6458f201f;p=thirdparty%2Ftor.git

Merge branch 'bug16034_no_more_openssl_098_squashed'

Conflicts:
	src/test/testing_common.c
---

ed02a409cfdd51671ff1d80c86cfc7d6458f201f
diff --cc src/or/main.c
index 3fb7de6f6c,3f785a2759..74e6b33397
--- 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 60be460660,e0c0046d71..7f387c0b3d
--- 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();