nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source
This commit is contained in:
Nick Mathewson 2013-03-15 11:01:06 -04:00
commit 2810753928
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug8014 Normal file
View File

@ -0,0 +1,5 @@
o Minor usability improvements (build):
- Clarify that when autconf is checking for nacl, it is checking
specifically for nacl with a fast curve25519 implementation.
Fixes bug 8014.

4
configure.ac
View File

@ -706,7 +706,7 @@ if test x$enable_curve25519 != xno; then
AC_CHECK_HEADERS([crypto_scalarmult_curve25519.h \ AC_CHECK_HEADERS([crypto_scalarmult_curve25519.h \
nacl/crypto_scalarmult_curve25519.h]) nacl/crypto_scalarmult_curve25519.h])
AC_CACHE_CHECK([whether we can use curve25519 from nacl], AC_CACHE_CHECK([for nacl compiled with a fast curve25519 implementation],
tor_cv_can_use_curve25519_nacl, tor_cv_can_use_curve25519_nacl,
[tor_saved_LIBS="$LIBS" [tor_saved_LIBS="$LIBS"
LIBS="$LIBS -lnacl" LIBS="$LIBS -lnacl"
@ -718,7 +718,7 @@ if test x$enable_curve25519 != xno; then
#include <nacl/crypto_scalarmult_curve25519.h> #include <nacl/crypto_scalarmult_curve25519.h>
#endif #endif
#ifdef crypto_scalarmult_curve25519_ref_BYTES #ifdef crypto_scalarmult_curve25519_ref_BYTES
#error Hey, this is the reference implementation! #error Hey, this is the reference implementation! That's not fast.
#endif #endif
], [ ], [
unsigned char *a, *b, *c; crypto_scalarmult_curve25519(a,b,c); unsigned char *a, *b, *c; crypto_scalarmult_curve25519(a,b,c);