tor

commit ea3d8ed8fe76443043fda65c133e6675c28ca0ef
parent 5111f6b13ec1d1d391018d9d8175bef6838925af
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  6 May 2025 08:43:34 -0400

Stop detecting HKDF: Our supported OpenSSL versions always have it

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

2 files changed, 1 insertion(+), 5 deletions(-)
diff --git 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
@@ -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>