Merge branch 'maint-0.3.1'

This commit is contained in:
Nick Mathewson
2017-07-12 09:24:01 -04:00
2 changed files with 7 additions and 0 deletions
+3
View File
@@ -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)