Stop detecting HKDF: Our supported OpenSSL versions always have it

diff --git a/configure.ac b/configure.ac
index 4752190883d3b3f26002f46386ff7eb09dcf0df1..f81e4aa7b60883c6fc922d7bfa76e9c7be23526f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1123,7 +1123,6 @@ dnl check the openssl version number, but in practice that gets pretty
 dnl confusing with LibreSSL, OpenSSL, and various distributions' patches
 dnl to them.
 AC_CHECK_FUNCS([ \
-               ERR_load_KDF_strings \
                EVP_PBE_scrypt \
                SSL_CIPHER_find \
                SSL_CTX_set1_groups_list \

diff --git a/src/lib/crypt_ops/crypto_hkdf.c b/src/lib/crypt_ops/crypto_hkdf.c
index ffdf71933d405f25027d339998fc429a077da3b2..18ac2938ac59909143dcae9c5e75a13f4b9ae9ab 100644 (file)
--- a/src/lib/crypt_ops/crypto_hkdf.c
+++ b/src/lib/crypt_ops/crypto_hkdf.c
@@ -20,11 +20,8 @@
 #ifdef ENABLE_OPENSSL
 #include <openssl/evp.h>
 #include <openssl/opensslv.h>
-
-#if defined(HAVE_ERR_LOAD_KDF_STRINGS)
 #include <openssl/kdf.h>
-#define HAVE_OPENSSL_HKDF 1
-#endif
+#define HAVE_OPENSSL_HKDF
 #endif /* defined(ENABLE_OPENSSL) */
 
 #include <string.h>