diff options
| author | Yawning Angel <yawning@schwanenlied.me> | 2015-05-21 17:07:30 +0000 |
|---|---|---|
| committer | Yawning Angel <yawning@schwanenlied.me> | 2015-05-21 17:07:30 +0000 |
| commit | 452cebc4a41bdba41d4a8ce3c16e73d585bb53f4 (patch) | |
| tree | 90145e18db15b67bdaf7e47a771c51014ec54ba7 /src/test/bench.c | |
| parent | 0b7bf3585a378bca4fc5bb551af3c37d517fdf28 (diff) | |
| download | tor-452cebc4a41bdba41d4a8ce3c16e73d585bb53f4.tar.gz tor-452cebc4a41bdba41d4a8ce3c16e73d585bb53f4.zip | |
Remove support for OpenSSL without ECC.
As OpenSSL >= 1.0.0 is now required, ECDHE is now mandatory. The group
has to be validated at runtime, because of RedHat lawyers (P224 support
is entirely missing in the OpenSSL RPM, but P256 is present and is the
default).
Resolves ticket #16140.
Diffstat (limited to 'src/test/bench.c')
| -rw-r--r-- | src/test/bench.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/test/bench.c b/src/test/bench.c index a74fc776fa..bc2b1f04d8 100644 --- a/src/test/bench.c +++ b/src/test/bench.c @@ -19,11 +19,9 @@ const char tor_git_revision[] = ""; #include "relay.h" #include <openssl/opensslv.h> #include <openssl/evp.h> -#ifndef OPENSSL_NO_EC #include <openssl/ec.h> #include <openssl/ecdh.h> #include <openssl/obj_mac.h> -#endif #include "config.h" #include "crypto_curve25519.h" @@ -502,8 +500,6 @@ bench_dh(void) " %f millisec each.\n", NANOCOUNT(start, end, iters)/1e6); } -#if !defined(OPENSSL_NO_EC) -#define HAVE_EC_BENCHMARKS static void bench_ecdh_impl(int nid, const char *name) { @@ -553,7 +549,6 @@ bench_ecdh_p224(void) { bench_ecdh_impl(NID_secp224r1, "P-224"); } -#endif typedef void (*bench_fn)(void); @@ -576,10 +571,8 @@ static struct benchmark_t benchmarks[] = { ENT(cell_aes), ENT(cell_ops), ENT(dh), -#ifdef HAVE_EC_BENCHMARKS ENT(ecdh_p256), ENT(ecdh_p224), -#endif {NULL,NULL,0} }; |