aboutsummaryrefslogtreecommitdiff
path: root/src/test/bench.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-05-20 15:33:22 -0400
committerNick Mathewson <nickm@torproject.org>2015-05-20 15:33:22 -0400
commited02a409cfdd51671ff1d80c86cfc7d6458f201f (patch)
tree527aeae3937418ca204426b682d7efd61c0ad57b /src/test/bench.c
parent32bd533ddac5bd7d594a81119449b3d30206eedd (diff)
parente9677c8f8d3a24bc572d63dd85fa14e8d596ad78 (diff)
downloadtor-ed02a409cfdd51671ff1d80c86cfc7d6458f201f.tar.gz
tor-ed02a409cfdd51671ff1d80c86cfc7d6458f201f.zip
Merge branch 'bug16034_no_more_openssl_098_squashed'
Conflicts: src/test/testing_common.c
Diffstat (limited to 'src/test/bench.c')
-rw-r--r--src/test/bench.c5
1 files changed, 2 insertions, 3 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);