diff options
| author | teor <teor2345@gmail.com> | 2014-09-29 12:06:15 +1000 |
|---|---|---|
| committer | teor <teor2345@gmail.com> | 2014-09-29 12:19:04 +1000 |
| commit | ffd92e8ef885f4a63fd09892d508674c9b4a1daf (patch) | |
| tree | cf1dfe86c54a54fcc6ad41ddad1ad7a05bc9c7fb /src/test/test_crypto.c | |
| parent | 47fab50cbaf3a41e8af9c63f645ad6075b43e565 (diff) | |
| download | tor-ffd92e8ef885f4a63fd09892d508674c9b4a1daf.tar.gz tor-ffd92e8ef885f4a63fd09892d508674c9b4a1daf.zip | |
Stop test & bench build failures with --disable-curve25519
Ensure test & bench code that references curve25519 is disabled by the
appropriate macros. tor now builds with and without --disable-curve25519.
Diffstat (limited to 'src/test/test_crypto.c')
| -rw-r--r-- | src/test/test_crypto.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 0c87c88f56..32ea2f6c0b 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -13,9 +13,9 @@ #include "siphash.h" #ifdef CURVE25519_ENABLED #include "crypto_curve25519.h" +#endif #include "crypto_ed25519.h" #include "ed25519_vectors.inc" -#endif #include "crypto_s2k.h" #include "crypto_pwbox.h" @@ -1697,8 +1697,6 @@ test_crypto_ed25519_test_vectors(void *arg) tor_free(mem_op_hex_tmp); } -#endif - static void test_crypto_ed25519_encode(void *arg) { @@ -1875,6 +1873,7 @@ test_crypto_ed25519_testvectors(void *arg) done: tor_free(mem_op_hex_tmp); } +#endif /* CURVE25519_ENABLED */ static void test_crypto_siphash(void *arg) |