summaryrefslogtreecommitdiff
path: root/src/test/include.am
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2014-10-27 14:37:50 +0100
committerSebastian Hahn <sebastian@torproject.org>2014-10-27 14:41:19 +0100
commit909aa51b3f4411b30bccbbf1dd9f876d150167fd (patch)
treee8fe448757c2aaaa0de5687ba9b7db9accdc7a2a /src/test/include.am
parentac4dd248e187b0327617c84ee2820a03b0a87a16 (diff)
downloadtor-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/include.am')
-rw-r--r--src/test/include.am6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/test/include.am b/src/test/include.am
index 8d05b3b700..d0f3224dc5 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -80,7 +80,6 @@ noinst_HEADERS+= \
src/test/failing_routerdescs.inc \
src/test/ed25519_vectors.inc
-if CURVE25519_ENABLED
noinst_PROGRAMS+= src/test/test-ntor-cl
src_test_test_ntor_cl_SOURCES = src/test/test_ntor_cl.c
src_test_test_ntor_cl_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@
@@ -91,9 +90,6 @@ src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \
src_test_test_ntor_cl_AM_CPPFLAGS = \
-I"$(top_srcdir)/src/or"
NTOR_TEST_DEPS=src/test/test-ntor-cl
-else
-NTOR_TEST_DEPS=
-endif
if COVERAGE_ENABLED
CMDLINE_TEST_TOR = ./src/or/tor-cov
@@ -113,10 +109,8 @@ src_test_test_bt_cl_CPPFLAGS= $(src_test_AM_CPPFLAGS)
check-local: $(NTOR_TEST_DEPS) $(CMDLINE_TEST_TOR)
if USEPYTHON
$(PYTHON) $(top_srcdir)/src/test/test_cmdline_args.py $(CMDLINE_TEST_TOR) "${top_srcdir}"
-if CURVE25519_ENABLED
$(PYTHON) $(top_srcdir)/src/test/ntor_ref.py test-tor
$(PYTHON) $(top_srcdir)/src/test/ntor_ref.py self-test
-endif
./src/test/test-bt-cl assert | $(PYTHON) $(top_srcdir)/src/test/bt_test.py
./src/test/test-bt-cl crash | $(PYTHON) $(top_srcdir)/src/test/bt_test.py
endif