From: Willem Toorop Date: Tue, 9 Nov 2021 20:27:03 +0000 (+0100) Subject: Fix #143: EVP_PKEY_base_id is a macro in OpenSSL 3 X-Git-Tag: 1.8.0-rc.1~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5100d8546b1a9c3d08cf9e24cd7e30421033ec4c;p=thirdparty%2Fldns.git Fix #143: EVP_PKEY_base_id is a macro in OpenSSL 3 Thanks @danielluke --- diff --git a/Changelog b/Changelog index 568a8fb9..29a837cf 100644 --- a/Changelog +++ b/Changelog @@ -54,6 +54,8 @@ * Fix #130: Unless $TLL is defined, ttl defaults to the last explicitly stated value. Thanks Benno * Fix #48: Missing UNSIGNED legend with drill. Thanks reedjc + * Fix #143: EVP_PKEY_base_id became a macro with OpenSSL > 3.0 + Thanks Daniel J. Luke 1.7.1 2019-07-26 * bugfix: Manage verification paths for OpenSSL >= 1.1.0 diff --git a/configure.ac b/configure.ac index dcebe1e9..9bd51319 100644 --- a/configure.ac +++ b/configure.ac @@ -358,7 +358,12 @@ else AC_MSG_RESULT([no]) fi AC_CHECK_HEADERS([openssl/ssl.h openssl/evp.h openssl/engine.h openssl/conf.h]) -AC_CHECK_FUNCS([EVP_sha256 EVP_sha384 EVP_sha512 EVP_PKEY_keygen ECDSA_SIG_get0 EVP_MD_CTX_new EVP_PKEY_base_id DSA_SIG_set0 DSA_SIG_get0 EVP_dss1 DSA_get0_pqg DSA_get0_key EVP_cleanup ENGINE_cleanup ENGINE_free CRYPTO_cleanup_all_ex_data ERR_free_strings CONF_modules_unload OPENSSL_init_ssl OPENSSL_init_crypto ERR_load_crypto_strings CRYPTO_memcmp EVP_PKEY_get_base_id]) +AC_CHECK_FUNCS([EVP_sha256 EVP_sha384 EVP_sha512 EVP_PKEY_keygen ECDSA_SIG_get0 EVP_MD_CTX_new DSA_SIG_set0 DSA_SIG_get0 EVP_dss1 DSA_get0_pqg DSA_get0_key EVP_cleanup ENGINE_cleanup ENGINE_free CRYPTO_cleanup_all_ex_data ERR_free_strings CONF_modules_unload OPENSSL_init_ssl OPENSSL_init_crypto ERR_load_crypto_strings CRYPTO_memcmp EVP_PKEY_get_base_id]) +AC_CHECK_DECLS([EVP_PKEY_base_id], [ + AC_DEFINE_UNQUOTED([HAVE_EVP_PKEY_BASE_ID], [1], [Define to 1 if you have the EVP_PKEY_base_id function or macro.]) +], [], [AC_INCLUDES_DEFAULT +#include +]) AC_MSG_CHECKING([Checking for OpenSSL >= 3.0.0]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include