diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-07-12 09:19:12 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-07-12 09:23:15 -0400 |
| commit | e111cfcd54662bd6cea86e7a970492b3b80bd723 (patch) | |
| tree | dd6a8903388f1a4b1a9d3bcfbe6894ead27795ed | |
| parent | 1ff98a7e891b7af4e2f4313c360f3cb320e632a7 (diff) | |
| download | tor-e111cfcd54662bd6cea86e7a970492b3b80bd723.tar.gz tor-e111cfcd54662bd6cea86e7a970492b3b80bd723.zip | |
Restore openssl and libscrypt includes in test_crypto_slow.c
This reverts part of commit 706c44a6ce0bbeee51c800521a3199d76e1dcd96.
It was a mistake to remove these includes: they were needed on
systems where we have openssl 1.1.0 *and* libscrypt, and where we
were validating the one against the other.
Fixes bug 22892; bugfix on 0.3.1.1-alpha.
| -rw-r--r-- | changes/bug22892 | 4 | ||||
| -rw-r--r-- | src/test/test_crypto_slow.c | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug22892 b/changes/bug22892 new file mode 100644 index 0000000000..9a70cb0576 --- /dev/null +++ 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 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) |