commit 10fb3398087133add9aff93740aff8f818edf242 Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 15 10:48:33 2013 -0400

Be explicit that we want not only nacl but nacl-with-a-fast-curve25519

Resolves the user experience part of #8014. --- changes/bug8014 | 5 +++++ configure.ac | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/changes/bug8014 b/changes/bug8014 new file mode 100644 index 0000000..c09a860 --- /dev/null +++ b/changes/bug8014 @@ -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. + diff --git a/configure.ac b/configure.ac index 4bc0db3..d588984 100644 --- a/configure.ac +++ b/configure.ac @@ -693,7 +693,7 @@ if test x$enable_curve25519 != xno; then AC_CHECK_HEADERS([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_saved_LIBS="$LIBS" LIBS="$LIBS -lnacl" @@ -705,7 +705,7 @@ if test x$enable_curve25519 != xno; then #include <nacl/crypto_scalarmult_curve25519.h> #endif #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 ], [ unsigned char *a, *b, *c; crypto_scalarmult_curve25519(a,b,c);