summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-07-12 09:24:01 -0400
committerNick Mathewson <nickm@torproject.org>2017-07-12 09:24:01 -0400
commit4984d6242af07b3e6b7d64dd2d82ada3fee564a2 (patch)
treea423929df5f61093cdcbbf9e609d98da9867f816 /src
parent7b2364035a6f80fd3158e1b6d7b0034989aefb38 (diff)
parente111cfcd54662bd6cea86e7a970492b3b80bd723 (diff)
downloadtor-4984d6242af07b3e6b7d64dd2d82ada3fee564a2.tar.gz
tor-4984d6242af07b3e6b7d64dd2d82ada3fee564a2.zip
Merge branch 'maint-0.3.1'
Diffstat (limited to 'src')
-rw-r--r--src/test/test_crypto_slow.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/test/test_crypto_slow.c b/src/test/test_crypto_slow.c
index d6b0a43dd5..6d676ff9b9 100644
--- a/src/test/test_crypto_slow.c
+++ b/src/test/test_crypto_slow.c
@@ -12,8 +12,11 @@
#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT)
#define HAVE_LIBSCRYPT
+#include <libscrypt.h>
#endif
+#include <openssl/evp.h>
+
/** Run unit tests for our secret-to-key passphrase hashing functionality. */
static void
test_crypto_s2k_rfc2440(void *arg)