diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-25 10:21:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-25 10:21:15 -0400 |
| commit | 44ea3dc3311564a9b7f6f67a106be0fa56b38554 (patch) | |
| tree | 54b12aaaf132570deb48aada4e025f9c792efd19 /src/common | |
| parent | a3ec811c2ee801bf6dd3d7f65c4997470e807c9d (diff) | |
| parent | 6d375f17fc6df89e9eaf2b9b69f3d69bb78dfc4d (diff) | |
| download | tor-44ea3dc3311564a9b7f6f67a106be0fa56b38554.tar.gz tor-44ea3dc3311564a9b7f6f67a106be0fa56b38554.zip | |
Merge branch '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 850a9632ca..5dbd2ad91f 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 |