From c8dcfc0853cb3c541e2d8068e7e1f954a509fd4d Mon Sep 17 00:00:00 2001 From: Yorgos Thessalonikefs Date: Fri, 24 Oct 2025 15:43:22 +0200 Subject: [PATCH] - For #1364, use OPENSSL_VERSION_TEXT instead of OPENSSL_VERSION_NUMBER for part of the configure script. OPENSSL_VERSION_TEXT is more consistent across versions. --- configure | 2 +- configure.ac | 2 +- doc/Changelog | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 9465db717..d3fdc3d58 100755 --- a/configure +++ b/configure @@ -21520,7 +21520,7 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if openssl supports SHA2 and ECDSA with EVP" >&5 printf %s "checking if openssl supports SHA2 and ECDSA with EVP... " >&6; } if grep OPENSSL_VERSION_TEXT $ssldir_include/openssl/opensslv.h | grep "OpenSSL" >/dev/null; then - if grep OPENSSL_VERSION_NUMBER $ssldir_include/openssl/opensslv.h | grep 0x0 >/dev/null; then + if grep OPENSSL_VERSION_TEXT $ssldir_include/openssl/opensslv.h | grep "OpenSSL 0\." >/dev/null; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } diff --git a/configure.ac b/configure.ac index dfc6f4ffa..09293706b 100644 --- a/configure.ac +++ b/configure.ac @@ -1254,7 +1254,7 @@ case "$enable_ecdsa" in # see if OPENSSL 1.0.0 or later (has EVP MD and Verify independency) AC_MSG_CHECKING([if openssl supports SHA2 and ECDSA with EVP]) if grep OPENSSL_VERSION_TEXT $ssldir_include/openssl/opensslv.h | grep "OpenSSL" >/dev/null; then - if grep OPENSSL_VERSION_NUMBER $ssldir_include/openssl/opensslv.h | grep 0x0 >/dev/null; then + if grep OPENSSL_VERSION_TEXT $ssldir_include/openssl/opensslv.h | grep "OpenSSL 0\." >/dev/null; then AC_MSG_RESULT([no]) AC_DEFINE_UNQUOTED([USE_ECDSA_EVP_WORKAROUND], [1], [Define this to enable an EVP workaround for older openssl]) else diff --git a/doc/Changelog b/doc/Changelog index 61474188a..fb1d18780 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -5,6 +5,9 @@ mailing list. - Fix unused attribute warning in redis.c when threads are not supported. + - For #1364, use OPENSSL_VERSION_TEXT instead of OPENSSL_VERSION_NUMBER + for part of the configure script. OPENSSL_VERSION_TEXT is more + consistent across versions. 22 October 2025: Yorgos - Tag for 1.24.1 release. -- 2.47.3