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/common/include.am | |
| 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/common/include.am')
| -rw-r--r-- | src/common/include.am | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/common/include.am b/src/common/include.am index 5c000e86f3..6441596199 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -54,12 +54,6 @@ endif LIBDONNA += $(LIBED25519_REF10) -if CURVE25519_ENABLED -libcrypto_extra_source = \ - src/common/crypto_curve25519.c \ - src/common/crypto_ed25519.c -endif - LIBOR_A_SOURCES = \ src/common/address.c \ src/common/backtrace.c \ @@ -85,8 +79,9 @@ LIBOR_CRYPTO_A_SOURCES = \ src/common/crypto_format.c \ src/common/torgzip.c \ src/common/tortls.c \ - src/trunnel/pwbox.c \ - $(libcrypto_extra_source) + src/trunnel/pwbox.c \ + src/common/crypto_curve25519.c \ + src/common/crypto_ed25519.c LIBOR_EVENT_A_SOURCES = \ src/common/compat_libevent.c \ |