From be3875cda2c45d8cd057c00e0bcc16bef9067d90 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 May 2016 10:28:31 -0400
Subject: Make sure that libscrypt_scrypt actually exists before using it.

Previously, if the header was present, we'd proceed even if the
function wasn't there.

Easy fix for bug 19161.  A better fix would involve trying harder to
find libscrypt_scrypt.
---
 src/common/crypto_s2k.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/common')

diff --git a/src/common/crypto_s2k.c b/src/common/crypto_s2k.c
index a9140c7553..3bc05f1cf9 100644
--- a/src/common/crypto_s2k.c
+++ b/src/common/crypto_s2k.c
@@ -19,7 +19,7 @@
 
 #include <openssl/evp.h>
 
-#ifdef HAVE_LIBSCRYPT_H
+#if defined(HAVE_LIBSCRYPT_H) && defined(HAVE_LIBSCRYPT_SCRYPT)
 #define HAVE_SCRYPT
 #include <libscrypt.h>
 #endif
-- 
cgit v1.2.3-54-g00ecf