diff options
| author | Sebastian Hahn <sebastian@torproject.org> | 2014-10-27 14:37:50 +0100 |
|---|---|---|
| committer | Sebastian Hahn <sebastian@torproject.org> | 2014-10-27 14:41:19 +0100 |
| commit | 909aa51b3f4411b30bccbbf1dd9f876d150167fd (patch) | |
| tree | e8fe448757c2aaaa0de5687ba9b7db9accdc7a2a /src/test/bench.c | |
| parent | ac4dd248e187b0327617c84ee2820a03b0a87a16 (diff) | |
| download | tor-909aa51b3f4411b30bccbbf1dd9f876d150167fd.tar.gz tor-909aa51b3f4411b30bccbbf1dd9f876d150167fd.zip | |
Remove configure option to disable curve25519
By now, support in the network is widespread and it's time to require
more modern crypto on all Tor instances, whether they're clients or
servers. By doing this early in 0.2.6, we can be sure that at some point
all clients will have reasonable support.
Diffstat (limited to 'src/test/bench.c')
| -rw-r--r-- | src/test/bench.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/test/bench.c b/src/test/bench.c index 825299835b..3a9432b137 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -26,10 +26,8 @@ const char tor_git_revision[] = ""; #endif #include "config.h" -#ifdef CURVE25519_ENABLED #include "crypto_curve25519.h" #include "onion_ntor.h" -#endif #include "crypto_ed25519.h" #if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_PROCESS_CPUTIME_ID) @@ -179,7 +177,6 @@ bench_onion_TAP(void) crypto_pk_free(key2); } -#ifdef CURVE25519_ENABLED static void bench_onion_ntor(void) { @@ -293,7 +290,6 @@ bench_ed25519(void) printf("Blind a public key: %.2f usec\n", MICROCOUNT(start, end, iters)); } -#endif static void bench_cell_aes(void) @@ -573,10 +569,9 @@ static struct benchmark_t benchmarks[] = { ENT(siphash), ENT(aes), ENT(onion_TAP), -#ifdef CURVE25519_ENABLED ENT(onion_ntor), ENT(ed25519), -#endif + ENT(cell_aes), ENT(cell_ops), ENT(dh), |