diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-01-16 13:56:10 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-01-16 13:56:10 -0500 |
| commit | 65e6e68981d9910c5f78f2cfed6c59cbee1494c7 (patch) | |
| tree | c4ac9df87c63144380a605327da0b37ea08fb1e1 /src/common | |
| parent | 7fc91dc274f38dc50f2a6eef2db060c788ef3040 (diff) | |
| parent | 50f527a2c9202105a84e5f6c7d2844c494a46b7d (diff) | |
| download | tor-65e6e68981d9910c5f78f2cfed6c59cbee1494c7.tar.gz tor-65e6e68981d9910c5f78f2cfed6c59cbee1494c7.zip | |
Merge branch 'bug7972'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/crypto_curve25519.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/common/crypto_curve25519.c b/src/common/crypto_curve25519.c index 5636fe63e3..88705427a8 100644 --- a/src/common/crypto_curve25519.c +++ b/src/common/crypto_curve25519.c @@ -22,7 +22,11 @@ int curve25519_donna(uint8_t *mypublic, const uint8_t *secret, const uint8_t *basepoint); #endif #ifdef USE_CURVE25519_NACL +#ifdef HAVE_CRYPTO_SCALARMULT_CURVE25519_H #include <crypto_scalarmult_curve25519.h> +#elif defined(HAVE_NACL_CRYPTO_SCALARMULT_CURVE25519_H) +#include <nacl/crypto_scalarmult_curve25519.h> +#endif #endif int |