Commit 2b523604 authored by Nick Mathewson's avatar Nick Mathewson 🌉
Browse files

Only use OpenSSL kdf support if it is present.

We have to check for ERR_load_KDF_strings() here, since that's the
only one that's actually a function rather than a macro.

Fixes compilation with LibreSSL.  Fixes bug 26712; bug not in
any released Tor.
parent 537092cd
...@@ -902,6 +902,7 @@ AC_CHECK_MEMBERS([struct ssl_method_st.get_cipher_by_char], , , ...@@ -902,6 +902,7 @@ AC_CHECK_MEMBERS([struct ssl_method_st.get_cipher_by_char], , ,
]) ])
AC_CHECK_FUNCS([ \ AC_CHECK_FUNCS([ \
ERR_load_KDF_strings \
SSL_SESSION_get_master_key \ SSL_SESSION_get_master_key \
SSL_get_server_random \ SSL_get_server_random \
SSL_get_client_ciphers \ SSL_get_client_ciphers \
......
...@@ -19,9 +19,9 @@ ...@@ -19,9 +19,9 @@
#include <openssl/opensslv.h> #include <openssl/opensslv.h>
#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) #if defined(HAVE_ERR_LOAD_KDF_STRINGS)
#define HAVE_OPENSSL_HKDF 1
#include <openssl/kdf.h> #include <openssl/kdf.h>
#define HAVE_OPENSSL_HKDF 1
#endif #endif
#include <string.h> #include <string.h>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment