Merge branch 'bug16034_no_more_openssl_098_squashed'

Conflicts:
	src/test/testing_common.c

4 files changed, 5 insertions, 6 deletions

diff --git a/src/test/bench.c b/src/test/bench.c
index 5cbc072700..a74fc776fa 100644
--- a/src/test/bench.c
+++ b/src/test/bench.c
@@ -502,8 +502,7 @@ bench_dh(void)
          "      %f millisec each.\n", NANOCOUNT(start, end, iters)/1e6);
 }
 
-#if (!defined(OPENSSL_NO_EC)                    \
-     && OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,0,0))
+#if !defined(OPENSSL_NO_EC)
 #define HAVE_EC_BENCHMARKS
 static void
 bench_ecdh_impl(int nid, const char *name)
@@ -625,7 +624,7 @@ main(int argc, const char **argv)
 
   reset_perftime();
 
-  crypto_seed_rng(1);
+  crypto_seed_rng();
   crypto_init_siphash_key();
   options = options_new();
   init_logging(1);
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c
index 84a90da7f8..7944864bd7 100644
--- a/src/test/test_crypto.c
+++ b/src/test/test_crypto.c
@@ -74,7 +74,7 @@ test_crypto_rng(void *arg)
 
   /* Try out RNG. */
   (void)arg;
-  tt_assert(! crypto_seed_rng(0));
+  tt_assert(! crypto_seed_rng());
   crypto_rand(data1, 100);
   crypto_rand(data2, 100);
   tt_mem_op(data1,OP_NE, data2,100);
diff --git a/src/test/test_workqueue.c b/src/test/test_workqueue.c
index 83f6f3e215..77053b0760 100644
--- a/src/test/test_workqueue.c
+++ b/src/test/test_workqueue.c
@@ -358,7 +358,7 @@ main(int argc, char **argv)
 
   init_logging(1);
   crypto_global_init(1, NULL, NULL);
-  crypto_seed_rng(1);
+  crypto_seed_rng();
 
   rq = replyqueue_new(as_flags);
   tor_assert(rq);
diff --git a/src/test/testing_common.c b/src/test/testing_common.c
index 60be460660..7f387c0b3d 100644
--- a/src/test/testing_common.c
+++ b/src/test/testing_common.c
@@ -270,7 +270,7 @@ main(int c, const char **v)
     return 1;
   }
   crypto_set_tls_dh_prime();
-  crypto_seed_rng(1);
+  crypto_seed_rng();
   rep_hist_init();
   network_init();
   setup_directory();