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 | |
| 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')
| -rw-r--r-- | src/common/crypto_curve25519.h | 2 | ||||
| -rw-r--r-- | src/common/crypto_ed25519.h | 3 | ||||
| -rw-r--r-- | src/common/include.am | 11 |
3 files changed, 3 insertions, 13 deletions
diff --git a/src/common/crypto_curve25519.h b/src/common/crypto_curve25519.h index 404f99c18e..11254c85e6 100644 --- a/src/common/crypto_curve25519.h +++ b/src/common/crypto_curve25519.h @@ -30,7 +30,6 @@ typedef struct curve25519_keypair_t { curve25519_secret_key_t seckey; } curve25519_keypair_t; -#ifdef CURVE25519_ENABLED /* These functions require that we actually know how to use curve25519 keys. * The other data structures and functions in this header let us parse them, * store them, and move them around. @@ -63,7 +62,6 @@ int curve25519_rand_seckey_bytes(uint8_t *out, int extra_strong); STATIC int curve25519_impl(uint8_t *output, const uint8_t *secret, const uint8_t *basepoint); #endif -#endif #define CURVE25519_BASE64_PADDED_LEN 44 diff --git a/src/common/crypto_ed25519.h b/src/common/crypto_ed25519.h index 13b05c7c1e..1a481b4dfd 100644 --- a/src/common/crypto_ed25519.h +++ b/src/common/crypto_ed25519.h @@ -39,7 +39,6 @@ typedef struct { ed25519_secret_key_t seckey; } ed25519_keypair_t; -#ifdef CURVE25519_ENABLED int ed25519_secret_key_generate(ed25519_secret_key_t *seckey_out, int extra_strong); int ed25519_secret_key_from_seed(ed25519_secret_key_t *seckey_out, @@ -88,8 +87,6 @@ int ed25519_public_blind(ed25519_public_key_t *out, const ed25519_public_key_t *inp, const uint8_t *param); -#endif - #define ED25519_BASE64_LEN 43 int ed25519_public_from_base64(ed25519_public_key_t *pkey, 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 \ |