aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2015-07-09 16:31:42 -0400
committerNick Mathewson <nickm@torproject.org>2015-07-09 16:31:42 -0400
commit0ca98c1ee5f81f95fefde984a474391ea8a9842a (patch)
treee27e1a85d9c128e307df90bbbca22d9bdb998f66 /configure.ac
parent4438b2a0e3822e464c4b6628944d76757d2237cb (diff)
parenta13d0fd342c4f9a997eaa87277fe42e11756a5fe (diff)
downloadtor-0ca98c1ee5f81f95fefde984a474391ea8a9842a.tar.gz
tor-0ca98c1ee5f81f95fefde984a474391ea8a9842a.zip
Merge branch 'libscrypt_eq_openssl_squashed'
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 4 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index e1501463c5..42681eb3ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -653,6 +653,10 @@ AC_CHECK_FUNCS([ \
SSL_CIPHER_find \
TLS_method
])
+
+dnl Check if OpenSSL has scrypt implementation.
+AC_CHECK_FUNCS([ EVP_PBE_scrypt ])
+
LIBS="$save_LIBS"
LDFLAGS="$save_LDFLAGS"
CPPFLAGS="$save_CPPFLAGS"