From 19736ac56007c3b6fbf1f6eea756f5d12304738e Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 21 Aug 2021 23:27:50 +0200
Subject: curl-openssl.m4: show correct output for OpenSSL v3

Using 3.0.0 versions configure should now show this:

checking for OpenSSL headers version... 3.0.0 - 0x300
checking for OpenSSL library version... 3.0.0
checking for OpenSSL headers and library versions matching... yes

This output doesn't actually change what configure generates but is only
"cosmetic".

Reported-by: Randall S. Becker
---
 m4/curl-openssl.m4 | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4
index 693114eca..f84462489 100644
--- a/m4/curl-openssl.m4
+++ b/m4/curl-openssl.m4
@@ -46,6 +46,9 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_HEADERS], [
 #     include <crypto.h>
 #   endif
     ], [silent])
+  CURL_CHECK_DEF([OPENSSL_VERSION_STR], [
+#     include <openssl/crypto.h>
+    ], [silent])
   if test "$curl_cv_have_def_OPENSSL_VERSION_NUMBER" = "yes"; then
     tst_verlen=`expr "$curl_cv_def_OPENSSL_VERSION_NUMBER" : '.*'`
     case "x$tst_verlen" in
@@ -62,7 +65,16 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_HEADERS], [
         tst_api=0x$tst_vermaj$tst_vermin$tst_verfix
         ;;
       *)
-        tst_api="unknown"
+        if test "$curl_cv_have_def_OPENSSL_VERSION_STR" = "yes"; then
+          ver=`echo $curl_cv_def_OPENSSL_VERSION_STR | sed s/\"//g`;
+          tst_vermaj=`echo $ver | cut -d. -f1`
+          tst_vermin=`echo $ver | cut -d. -f2`
+          tst_verfix=`echo $ver | cut -d. -f3`
+          tst_show="$ver"
+          tst_api=0x$tst_vermaj$tst_vermin$tst_verfix
+        else
+          tst_api="unknown"
+        fi
         ;;
     esac
     case $tst_api in
@@ -80,9 +92,13 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_HEADERS], [
       0x093) tst_show="0.9.3" ;;
       0x092) tst_show="0.9.2" ;;
       0x091) tst_show="0.9.1" ;;
-      *)     tst_show="unknown" ;;
+      *)
+      if test -z "$tst_show"; then
+        tst_show="unknown"
+      fi
+      ;;
     esac
-    tst_show="$tst_show - $curl_cv_def_OPENSSL_VERSION_NUMBER"
+    tst_show="$tst_show - $tst_api"
   else
     tst_show="unknown"
   fi
@@ -122,6 +138,13 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_LIBRARY], [
   tst_api="unknown"
   #
   AC_MSG_CHECKING([for OpenSSL library version])
+  if test "$tst_api" = "unknown"; then
+    AC_LINK_IFELSE([
+      AC_LANG_FUNC_LINK_TRY([SSL_CTX_load_verify_dir])
+    ],[
+      tst_api="0x300"
+    ])
+  fi
   if test "$tst_api" = "unknown"; then
     AC_LINK_IFELSE([
       AC_LANG_FUNC_LINK_TRY([ERR_clear_last_mark])
@@ -225,6 +248,7 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_LIBRARY], [
     ])
   fi
   case $tst_api in
+    0x300) tst_show="3.0.0" ;;
     0x111) tst_show="1.1.1" ;;
     0x110) tst_show="1.1.0" ;;
     0x102) tst_show="1.0.2" ;;
-- 
cgit v1.2.1