From 679ab77b96324da6540910aa106ec187fd477194 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Mon, 8 Jun 2026 14:45:03 -0400 Subject: [PATCH] Use EVP_PKEY_id() for OpenSSL 1.1 detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The previous function, EVP_PKEY_meth_remove(), was deprecated in OpenSSL 3.0 and fully removed in OpenSSL 4.0. As a result, it fails detection of OpenSSL 1.1+ if OpenSSL 4 is present. Closes: https://github.com/ibm-s390-linux/s390-tools/pull/204 [seiden@linux.ibm.com: Add link to GH PR] Signed-off-by: Stephen Gallagher Signed-off-by: Steffen Eiden Signed-off-by: Jan Höppner --- libekmfweb/Makefile | 2 +- libkmipclient/Makefile | 2 +- libseckey/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libekmfweb/Makefile b/libekmfweb/Makefile index f6c60eaa..4bc0fb76 100644 --- a/libekmfweb/Makefile +++ b/libekmfweb/Makefile @@ -43,7 +43,7 @@ detect-openssl-version.dep: echo " #error openssl version 1.1 is required" >> $(TMPFILE) echo "#endif" >> $(TMPFILE) echo "static void __attribute__((unused)) test(void) {" >> $(TMPFILE) - echo " EVP_PKEY_meth_remove(NULL);" >> $(TMPFILE) + echo " EVP_PKEY_id(NULL);" >> $(TMPFILE) echo "}" >> $(TMPFILE) mv $(TMPFILE) $@ diff --git a/libkmipclient/Makefile b/libkmipclient/Makefile index c37f8820..fe4532b8 100644 --- a/libkmipclient/Makefile +++ b/libkmipclient/Makefile @@ -46,7 +46,7 @@ detect-openssl-version.dep: echo " #error openssl version 1.1 is required" >> $(TMPFILE) echo "#endif" >> $(TMPFILE) echo "static void __attribute__((unused)) test(void) {" >> $(TMPFILE) - echo " EVP_PKEY_meth_remove(NULL);" >> $(TMPFILE) + echo " EVP_PKEY_id(NULL);" >> $(TMPFILE) echo "}" >> $(TMPFILE) mv $(TMPFILE) $@ diff --git a/libseckey/Makefile b/libseckey/Makefile index 66b94446..4ddcc8fd 100644 --- a/libseckey/Makefile +++ b/libseckey/Makefile @@ -28,7 +28,7 @@ detect-openssl-version.dep: echo " #error openssl version 1.1 is required" >> $(TMPFILE) echo "#endif" >> $(TMPFILE) echo "static void __attribute__((unused)) test(void) {" >> $(TMPFILE) - echo " EVP_PKEY_meth_remove(NULL);" >> $(TMPFILE) + echo " EVP_PKEY_id(NULL);" >> $(TMPFILE) echo "}" >> $(TMPFILE) mv $(TMPFILE) $@