tor

commit 4984d6242af07b3e6b7d64dd2d82ada3fee564a2
parent 7b2364035a6f80fd3158e1b6d7b0034989aefb38
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 12 Jul 2017 09:24:01 -0400

Merge branch 'maint-0.3.1'

Diffstat:
A
changes/bug22892
 | 
4
++++
M
src/test/test_crypto_slow.c
 | 
3
+++

2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/changes/bug22892 b/changes/bug22892
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+    - Compile correctly when both openssl 1.1.0 and libscrypt are detected.
+      Previously this would cause an error. Fixes bug 22892; bugfix on 
+      0.3.1.1-alpha.
diff --git 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)