fixup! crypto: split OpenSSL 3, BoringSSL, and legacy backends

Author: panva

deps/ncrypto/ncrypto.gyp

@@ -13,6 +13,9 @@
       'OPENSSL_API_COMPAT=30000',
       'OPENSSL_NO_DEPRECATED',
     ],
+    'ncrypto_legacy_openssl_defines': [
+      'OPENSSL_API_COMPAT=0x10100000L',
+    ],
     'ncrypto_engine_defines': [
       'OPENSSL_API_COMPAT=30000',
       'OPENSSL_SUPPRESS_DEPRECATED',
@@ -53,13 +56,15 @@
         ],
         'conditions': [
           ['openssl_is_boringssl=="false" and openssl_version >= 0x3000000f', {
+            'defines!': [ '<@(ncrypto_legacy_openssl_defines)' ],
             'defines': [ '<@(ncrypto_strict_defines)' ],
           }],
         ],
       },
       'sources': [ '<@(ncrypto_sources)' ],
       'conditions': [
         ['openssl_is_boringssl=="false" and openssl_version >= 0x3000000f', {
+          'defines!': [ '<@(ncrypto_legacy_openssl_defines)' ],
           'defines': [ '<@(ncrypto_strict_defines)' ],
           'dependencies': [
             'ncrypto_engine',

deps/ncrypto/ncrypto.h

@@ -146,7 +146,6 @@
 #define EVP_PKEY_ML_KEM_512 NID_ML_KEM_512
 #define EVP_PKEY_ML_KEM_768 NID_ML_KEM_768
 #define EVP_PKEY_ML_KEM_1024 NID_ML_KEM_1024
-#include <openssl/core_names.h>
 #elif OPENSSL_WITH_BORINGSSL_PQC
 #define EVP_PKEY_ML_KEM_768 NID_ML_KEM_768
 #define EVP_PKEY_ML_KEM_1024 NID_ML_KEM_1024
@@ -546,7 +545,9 @@ class Dsa final {
   NCRYPTO_DISALLOW_COPY_AND_MOVE(Dsa)
 
 #if NCRYPTO_USE_OPENSSL3_PROVIDER
-  inline operator bool() const { return dsa_; }
+  inline operator bool() const {
+    return dsa_;
+  }
 #else
   inline operator bool() const { return dsa_ != nullptr; }
 #endif
@@ -583,7 +584,9 @@ class Rsa final {
   NCRYPTO_DISALLOW_COPY_AND_MOVE(Rsa)
 
 #if NCRYPTO_USE_OPENSSL3_PROVIDER
-  inline operator bool() const { return rsa_; }
+  inline operator bool() const {
+    return rsa_;
+  }
 #else
   inline operator bool() const { return rsa_ != nullptr; }
 #endif
@@ -1179,8 +1182,12 @@ class DHPointer final {
   ~DHPointer();
 
 #if NCRYPTO_USE_OPENSSL3_PROVIDER
-  inline bool operator==(std::nullptr_t) noexcept { return !operator bool(); }
-  inline operator bool() const { return dh_ != nullptr || (p_ && g_); }
+  inline bool operator==(std::nullptr_t) noexcept {
+    return !operator bool();
+  }
+  inline operator bool() const {
+    return dh_ != nullptr || (p_ && g_);
+  }
 #else
   inline bool operator==(std::nullptr_t) noexcept { return dh_ == nullptr; }
   inline operator bool() const { return dh_ != nullptr; }
@@ -1190,7 +1197,9 @@ class DHPointer final {
   void reset(DH* dh = nullptr);
   DH* release();
 #else
-  inline EVP_PKEY* get() const { return dh_.get(); }
+  inline EVP_PKEY* get() const {
+    return dh_.get();
+  }
   void reset(EVP_PKEY* dh = nullptr);
   EVP_PKEY* release();
 #endif
@@ -1575,8 +1584,12 @@ class ECKeyPointer final {
   ~ECKeyPointer();
 
 #if NCRYPTO_USE_OPENSSL3_PROVIDER
-  inline bool operator==(std::nullptr_t) noexcept { return group_ == nullptr; }
-  inline operator bool() const { return group_ != nullptr; }
+  inline bool operator==(std::nullptr_t) noexcept {
+    return group_ == nullptr;
+  }
+  inline operator bool() const {
+    return group_ != nullptr;
+  }
 #else
   inline bool operator==(std::nullptr_t) noexcept { return key_ == nullptr; }
   inline operator bool() const { return key_ != nullptr; }

src/crypto/crypto_context.cc

@@ -31,7 +31,6 @@
 
 namespace node {
 
-using ncrypto::BignumPointer;
 using ncrypto::BIOPointer;
 using ncrypto::Cipher;
 using ncrypto::ClearErrorOnReturn;

src/crypto/crypto_x509.cc

@@ -20,7 +20,6 @@ using ncrypto::BIOPointer;
 using ncrypto::ClearErrorOnReturn;
 using ncrypto::DataPointer;
 using ncrypto::Digest;
-using ncrypto::ECKeyPointer;
 using ncrypto::SSLPointer;
 using ncrypto::X509Name;
 using ncrypto::X509Pointer;