From: Viktor Szakats <commit@vsz.me>
Date: Fri, 22 Aug 2025 16:36:30 +0000 (+0200)
Subject: openssl: drop redundant `HAVE_OPENSSL_VERSION` macro
X-Git-Tag: curl-8_16_0~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63bf7a089869b0cf7d6b40e0f67620b79126c321;p=thirdparty%2Fcurl.git

openssl: drop redundant `HAVE_OPENSSL_VERSION` macro

It served as an extra guard over `OPENSSL_VERSION_STRING`.

Also, document that `OPENSSL_VERSION_STRING` is supported by OpenSSL 3+.

Closes #18367
---

diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 2b03254014..ccdcdf1c47 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -244,10 +244,6 @@ typedef int numcert_t;
 #define HAVE_RANDOM_INIT_BY_DEFAULT 1
 #endif
 
-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(HAVE_BORINGSSL_LIKE)
-#define HAVE_OPENSSL_VERSION
-#endif
-
 #ifdef HAVE_BORINGSSL_LIKE
 typedef uint32_t sslerr_t;
 #else
@@ -5576,7 +5572,7 @@ size_t Curl_ossl_version(char *buffer, size_t size)
   return msnprintf(buffer, size, "%s/%s",
                    OSSL_PACKAGE,
                    AWSLC_VERSION_NUMBER_STRING);
-#elif defined(HAVE_OPENSSL_VERSION) && defined(OPENSSL_VERSION_STRING)
+#elif defined(OPENSSL_VERSION_STRING)  /* OpenSSL 3+ */
   return msnprintf(buffer, size, "%s/%s",
                    OSSL_PACKAGE, OpenSSL_version(OPENSSL_VERSION_STRING));
 #else