From: Viktor Szakats <commit@vsz.me>
Date: Sat, 23 Aug 2025 22:36:52 +0000 (+0200)
Subject: openssl: assume `OPENSSL_VERSION_NUMBER`
X-Git-Tag: curl-8_16_0~91
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca6d6dcb20c41635a211208ebbe40520275b2d2f;p=thirdparty%2Fcurl.git

openssl: assume `OPENSSL_VERSION_NUMBER`

It's defined in all supported OpenSSL versions and forks.

Also formatting in `md4.c`.

Closes #18388
---

diff --git a/lib/curl_sha512_256.c b/lib/curl_sha512_256.c
index 7258e3f413..e11b2d6a9c 100644
--- a/lib/curl_sha512_256.c
+++ b/lib/curl_sha512_256.c
@@ -41,7 +41,6 @@
 #ifdef USE_OPENSSL
 #  include <openssl/opensslv.h>
 #  if (!defined(LIBRESSL_VERSION_NUMBER) && \
-       defined(OPENSSL_VERSION_NUMBER) && \
        OPENSSL_VERSION_NUMBER >= 0x10101000L) || \
       (defined(LIBRESSL_VERSION_NUMBER) && \
        LIBRESSL_VERSION_NUMBER >= 0x3080000fL)
diff --git a/lib/md4.c b/lib/md4.c
index ab40c41b25..b9c98d6c4a 100644
--- a/lib/md4.c
+++ b/lib/md4.c
@@ -34,7 +34,7 @@
 
 #ifdef USE_OPENSSL
 #include <openssl/opensslv.h>
-#if (OPENSSL_VERSION_NUMBER >= 0x30000000L) && !defined(USE_AMISSL)
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L && !defined(USE_AMISSL)
 /* OpenSSL 3.0.0 marks the MD4 functions as deprecated */
 #define OPENSSL_NO_MD4
 #else