From aab56206a03fe9bdc5941fa0e42ca807f8d38777 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Sep 28 2021 14:37:49 +0000
Subject: Add compile check for EVP_PKEY_get_id along with EVP_PKEY_id


EVP_PKEY_id is no longer available as a function, only as a preprocessor
macro, so AC_CHECK_FUNCS cannot recognize it.

This was changed in OpenSSL 3.0.0-beta2

https://bugzilla.redhat.com/show_bug.cgi?id=2008451

Signed-off-by: Rob Crittenden <rcritten@redhat.com>

---

diff --git a/configure.ac b/configure.ac
index 0f857a6..1965d21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -374,6 +374,7 @@ if ! ${configure_dist_target_only:-false} ; then
 		AC_CHECK_FUNCS(ASN1_TIME_set)
 		AC_CHECK_FUNCS(EVP_PKEY_base_id)
 		AC_CHECK_FUNCS(EVP_PKEY_id)
+		AC_CHECK_FUNCS(EVP_PKEY_get_id)
 		AC_CHECK_FUNCS(OBJ_get0_data)
 		AC_CHECK_FUNCS(OBJ_length)
 		AC_CHECK_FUNCS(X509_ATTRIBUTE_get0_object)
diff --git a/src/util-o.c b/src/util-o.c
index 0415014..e684d7a 100644
--- a/src/util-o.c
+++ b/src/util-o.c
@@ -327,7 +327,7 @@ util_ASN1_TIME_set(ASN1_TIME *str, time_t t)
 int
 util_EVP_PKEY_id(const EVP_PKEY *pkey)
 {
-#ifdef HAVE_EVP_PKEY_ID
+#if defined(HAVE_EVP_PKEY_ID) || defined(HAVE_EVP_PKEY_GET_ID)
 	return EVP_PKEY_id(pkey);
 #else
 	return pkey->type;