mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-19 09:50:29 +01:00
Check for nacl headers in nacl/ subdir
Fix for bug 7972
This commit is contained in:
parent
f57722d23e
commit
b987081941
3
changes/bug7972
Normal file
3
changes/bug7972
Normal file
@ -0,0 +1,3 @@
|
||||
o Minor bugfixes:
|
||||
- Detect nacl when its headers are in a nacl/ subdirectory. Fixes bug
|
||||
7972; bugfix on 0.2.4.8-alpha.
|
@ -689,13 +689,20 @@ if test x$enable_curve25519 != xno; then
|
||||
[tor_cv_can_use_curve25519_donna_c64=cross],
|
||||
[tor_cv_can_use_curve25519_donna_c64=no])])])
|
||||
|
||||
AC_CHECK_HEADERS([crypto_scalarmult_curve25519.h \
|
||||
nacl/crypto_scalarmult_curve25519.h])
|
||||
|
||||
AC_CACHE_CHECK([whether we can use curve25519 from nacl],
|
||||
tor_cv_can_use_curve25519_nacl,
|
||||
[tor_saved_LIBS="$LIBS"
|
||||
LIBS="$LIBS -lnacl"
|
||||
AC_LINK_IFELSE(
|
||||
[AC_LANG_PROGRAM([dnl
|
||||
#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
|
||||
#ifdef crypto_scalarmult_curve25519_ref_BYTES
|
||||
#error Hey, this is the reference implementation!
|
||||
#endif
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user