diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-25 10:17:26 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-25 10:17:26 -0400 |
| commit | 6d375f17fc6df89e9eaf2b9b69f3d69bb78dfc4d (patch) | |
| tree | d74122a462733613876260bd945fffcb1ba548db /src/common | |
| parent | fdfc528f85c11a1d29b6a67e32180278d1ca7cbb (diff) | |
| parent | be3875cda2c45d8cd057c00e0bcc16bef9067d90 (diff) | |
| download | tor-6d375f17fc6df89e9eaf2b9b69f3d69bb78dfc4d.tar.gz tor-6d375f17fc6df89e9eaf2b9b69f3d69bb78dfc4d.zip | |
Merge branch 'bug19161_028_v2' into maint-0.2.8
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/crypto_s2k.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |