tor

commit 7253603e6b32ceb5f766017d95ac0a05002b5ed7
parent b44fce67163cadbb951005416808b9b217c67639
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 19 Jul 2018 12:20:13 -0400

Merge branch 'bug26712'

Diffstat:
M
configure.ac
 | 
1
+
M
src/lib/crypt_ops/crypto_hkdf.c
 | 
4
++--

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
@@ -902,6 +902,7 @@ AC_CHECK_MEMBERS([struct ssl_method_st.get_cipher_by_char], , ,
 ])
 
 AC_CHECK_FUNCS([ \
+		ERR_load_KDF_strings \
 		SSL_SESSION_get_master_key \
 		SSL_get_server_random \
                 SSL_get_client_ciphers \
diff --git a/src/lib/crypt_ops/crypto_hkdf.c b/src/lib/crypt_ops/crypto_hkdf.c
@@ -19,9 +19,9 @@
 
 #include <openssl/opensslv.h>
 
-#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)
-#define HAVE_OPENSSL_HKDF 1
+#if defined(HAVE_ERR_LOAD_KDF_STRINGS)
 #include <openssl/kdf.h>
+#define HAVE_OPENSSL_HKDF 1
 #endif
 
 #include <string.h>