Merge macro checks

Author: ranisalt

deps/ncrypto/ncrypto.cc

@@ -1857,8 +1857,8 @@ DataPointer pbkdf2(const Digest& md,
   return {};
 }
 
-#if OPENSSL_VERSION_MAJOR >= 3 && OPENSSL_VERSION_MINOR >= 2
-#ifndef OPENSSL_NO_ARGON2
+#if OPENSSL_VERSION_MAJOR >= 3 && OPENSSL_VERSION_MINOR >= 2 &&                \
+    !defined(OPENSSL_NO_ARGON2)
 DataPointer argon2(const Buffer<const char>& pass,
                    const Buffer<const unsigned char>& salt,
                    uint32_t lanes,
@@ -1948,7 +1948,6 @@ DataPointer argon2(const Buffer<const char>& pass,
 
   return {};
 }
-#endif  // !OPENSSL_NO_ARGON2
 #endif
 
 // ============================================================================

deps/ncrypto/ncrypto.h

@@ -1539,7 +1539,8 @@ DataPointer pbkdf2(const Digest& md,
                    uint32_t iterations,
                    size_t length);
 
-#ifndef OPENSSL_NO_ARGON2
+#if OPENSSL_VERSION_MAJOR >= 3 && OPENSSL_VERSION_MINOR >= 2 &&                \
+    !defined(OPENSSL_NO_ARGON2)
 enum class Argon2Type { ARGON2I, ARGON2D, ARGON2ID };
 
 DataPointer argon2(const Buffer<const char>& pass,
@@ -1552,7 +1553,7 @@ DataPointer argon2(const Buffer<const char>& pass,
                    const Buffer<const unsigned char>& secret,
                    const Buffer<const unsigned char>& ad,
                    Argon2Type type);
-#endif  // !OPENSSL_NO_ARGON2
+#endif
 
 // ============================================================================
 // Version metadata

src/crypto/crypto_argon2.cc

@@ -1,10 +1,11 @@
 #include "crypto/crypto_argon2.h"
 
-namespace node::crypto {
-#if OPENSSL_VERSION_MAJOR >= 3 && OPENSSL_VERSION_MINOR >= 2
-#ifndef OPENSSL_NO_ARGON2
+#if OPENSSL_VERSION_MAJOR >= 3 && OPENSSL_VERSION_MINOR >= 2 &&                \
+    !defined(OPENSSL_NO_ARGON2)
 #include <openssl/core_names.h>
 
+namespace node::crypto {
+
 using v8::FunctionCallbackInfo;
 using v8::JustVoid;
 using v8::Maybe;
@@ -167,6 +168,6 @@ bool Argon2Traits::DeriveBits(Environment* env,
   return true;
 }
 
-#endif  // !OPENSSL_NO_ARGON2
-#endif
 }  // namespace node::crypto
+
+#endif

src/crypto/crypto_argon2.h

@@ -6,8 +6,8 @@
 #include "crypto/crypto_util.h"
 
 namespace node::crypto {
-#if OPENSSL_VERSION_MAJOR >= 3 && OPENSSL_VERSION_MINOR >= 2
-#ifndef OPENSSL_NO_ARGON2
+#if OPENSSL_VERSION_MAJOR >= 3 && OPENSSL_VERSION_MINOR >= 2 &&                \
+    !defined(OPENSSL_NO_ARGON2)
 
 // Argon2 is a password-based key derivation algorithm
 // defined in https://datatracker.ietf.org/doc/html/rfc9106
@@ -76,7 +76,6 @@ struct Argon2Job {
   static void Initialize(Environment* env, v8::Local<v8::Object> target) {}
 };
 
-#endif  // !OPENSSL_NO_ARGON2
 #endif
 }  // namespace node::crypto