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 7258e3f4138675ec187a561923466fdbde12467a..e11b2d6a9cf1a8e4ad7bd1133164102330e43594 100644 (file)
--- 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 ab40c41b25a8372b3d089b6c05eb3be700349100..b9c98d6c4aea869b8733cda00ff6d6704e2ab155 100644 (file)
--- 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