- 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.

diff --git a/configure b/configure
index 9465db7174cbe4bc66f97e83349fbb83e935d71e..d3fdc3d585e5e5b4125ed7aa883cb03de74134ce 100755 (executable)
--- 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 dfc6f4ffaf786677f35dbd84371c3a473ca38c79..09293706b3d07fd498523356b2c60ef620973928 100644 (file)
--- 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 61474188ab13ef2b46c902a8811dc67460e3fcda..fb1d18780bc6852c913ee40a1cbc5aa863e8a970 100644 (file)
--- 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.