fixup! chore: sync ncrypto from nodejs/node

Signed-off-by: Filip Skokan <[email protected]>

Author: panva

include/ncrypto.h

@@ -1703,7 +1703,6 @@ DataPointer pbkdf2(const Digest& md,
                    uint32_t iterations,
                    size_t length);
 
-<<<<<<< nodejs/ncrypto:include/ncrypto.h
 #if OPENSSL_VERSION_NUMBER >= 0x30200000L
 #ifndef OPENSSL_NO_ARGON2
 enum class Argon2Type { ARGON2D, ARGON2I, ARGON2ID };
@@ -1721,60 +1720,6 @@ DataPointer argon2(const Buffer<const char>& pass,
 #endif
 #endif
 
-||||||| nodejs/node:deps/ncrypto/ncrypto.h@84aaed75978e
-=======
-#if OPENSSL_VERSION_NUMBER >= 0x30200000L
-#ifndef OPENSSL_NO_ARGON2
-enum class Argon2Type { ARGON2D, ARGON2I, ARGON2ID };
-
-DataPointer argon2(const Buffer<const char>& pass,
-                   const Buffer<const unsigned char>& salt,
-                   uint32_t lanes,
-                   size_t length,
-                   uint32_t memcost,
-                   uint32_t iter,
-                   uint32_t version,
-                   const Buffer<const unsigned char>& secret,
-                   const Buffer<const unsigned char>& ad,
-                   Argon2Type type);
-#endif
-#endif
-
-// ============================================================================
-// KEM (Key Encapsulation Mechanism)
-#if OPENSSL_VERSION_MAJOR >= 3
-
-class KEM final {
- public:
-  struct EncapsulateResult {
-    DataPointer ciphertext;
-    DataPointer shared_key;
-
-    EncapsulateResult() = default;
-    EncapsulateResult(DataPointer ct, DataPointer sk)
-        : ciphertext(std::move(ct)), shared_key(std::move(sk)) {}
-  };
-
-  // Encapsulate a shared secret using KEM with a public key.
-  // Returns both the ciphertext and shared secret.
-  static std::optional<EncapsulateResult> Encapsulate(
-      const EVPKeyPointer& public_key);
-
-  // Decapsulate a shared secret using KEM with a private key and ciphertext.
-  // Returns the shared secret.
-  static DataPointer Decapsulate(const EVPKeyPointer& private_key,
-                                 const Buffer<const void>& ciphertext);
-
- private:
-#if !OPENSSL_VERSION_PREREQ(3, 5)
-  static bool SetOperationParameter(EVP_PKEY_CTX* ctx,
-                                    const EVPKeyPointer& key);
-#endif
-};
-
-#endif  // OPENSSL_VERSION_MAJOR >= 3
-
->>>>>>> nodejs/node:deps/ncrypto/ncrypto.h@8385efc01343
 // ============================================================================
 // KEM (Key Encapsulation Mechanism)
 #if OPENSSL_VERSION_MAJOR >= 3

src/ncrypto.cpp

@@ -15,20 +15,11 @@
 #include <openssl/hkdf.h>
 #endif
 
-#if OPENSSL_VERSION_NUMBER >= 0x30200000L
-#include <openssl/thread.h>
-#endif
-
 #include <algorithm>
 #include <array>
 #include <cstring>
-<<<<<<< nodejs/ncrypto:src/ncrypto.cpp
 #include <string_view>
 #include <vector>
-||||||| nodejs/node:deps/ncrypto/ncrypto.cc@84aaed75978e
-=======
-#include <string_view>
->>>>>>> nodejs/node:deps/ncrypto/ncrypto.cc@8385efc01343
 #if OPENSSL_VERSION_MAJOR >= 3
 #include <openssl/core_names.h>
 #include <openssl/params.h>
@@ -3258,20 +3249,13 @@ const Cipher Cipher::AES_256_GCM = Cipher::FromNid(NID_aes_256_gcm);
 const Cipher Cipher::AES_128_KW = Cipher::FromNid(NID_id_aes128_wrap);
 const Cipher Cipher::AES_192_KW = Cipher::FromNid(NID_id_aes192_wrap);
 const Cipher Cipher::AES_256_KW = Cipher::FromNid(NID_id_aes256_wrap);
-<<<<<<< nodejs/ncrypto:src/ncrypto.cpp
 
 #ifndef OPENSSL_IS_BORINGSSL
 const Cipher Cipher::AES_128_OCB = Cipher::FromNid(NID_aes_128_ocb);
 const Cipher Cipher::AES_192_OCB = Cipher::FromNid(NID_aes_192_ocb);
 const Cipher Cipher::AES_256_OCB = Cipher::FromNid(NID_aes_256_ocb);
 #endif
 
-||||||| nodejs/node:deps/ncrypto/ncrypto.cc@84aaed75978e
-=======
-const Cipher Cipher::AES_128_OCB = Cipher::FromNid(NID_aes_128_ocb);
-const Cipher Cipher::AES_192_OCB = Cipher::FromNid(NID_aes_192_ocb);
-const Cipher Cipher::AES_256_OCB = Cipher::FromNid(NID_aes_256_ocb);
->>>>>>> nodejs/node:deps/ncrypto/ncrypto.cc@8385efc01343
 const Cipher Cipher::CHACHA20_POLY1305 = Cipher::FromNid(NID_chacha20_poly1305);
 
 bool Cipher::isGcmMode() const {
@@ -4552,57 +4536,6 @@ std::optional<EVP_PKEY_CTX*> EVPMDCtxPointer::verifyInit(
   return ctx;
 }
 
-<<<<<<< nodejs/ncrypto:src/ncrypto.cpp
-std::optional<EVP_PKEY_CTX*> EVPMDCtxPointer::signInitWithContext(
-    const EVPKeyPointer& key,
-    const Digest& digest,
-    const Buffer<const unsigned char>& context_string) {
-#ifdef OSSL_SIGNATURE_PARAM_CONTEXT_STRING
-  EVP_PKEY_CTX* ctx = nullptr;
-
-  const OSSL_PARAM params[] = {
-      OSSL_PARAM_construct_octet_string(
-          OSSL_SIGNATURE_PARAM_CONTEXT_STRING,
-          const_cast<unsigned char*>(context_string.data),
-          context_string.len),
-      OSSL_PARAM_END};
-
-  if (!EVP_DigestSignInit_ex(
-          ctx_.get(), &ctx, nullptr, nullptr, nullptr, key.get(), params)) {
-    return std::nullopt;
-  }
-  return ctx;
-#else
-  return std::nullopt;
-#endif
-}
-
-std::optional<EVP_PKEY_CTX*> EVPMDCtxPointer::verifyInitWithContext(
-    const EVPKeyPointer& key,
-    const Digest& digest,
-    const Buffer<const unsigned char>& context_string) {
-#ifdef OSSL_SIGNATURE_PARAM_CONTEXT_STRING
-  EVP_PKEY_CTX* ctx = nullptr;
-
-  const OSSL_PARAM params[] = {
-      OSSL_PARAM_construct_octet_string(
-          OSSL_SIGNATURE_PARAM_CONTEXT_STRING,
-          const_cast<unsigned char*>(context_string.data),
-          context_string.len),
-      OSSL_PARAM_END};
-
-  if (!EVP_DigestVerifyInit_ex(
-          ctx_.get(), &ctx, nullptr, nullptr, nullptr, key.get(), params)) {
-    return std::nullopt;
-  }
-  return ctx;
-#else
-  return std::nullopt;
-#endif
-}
-
-||||||| nodejs/node:deps/ncrypto/ncrypto.cc@84aaed75978e
-=======
 std::optional<EVP_PKEY_CTX*> EVPMDCtxPointer::signInitWithContext(
     const EVPKeyPointer& key,
     const Digest& digest,
@@ -4693,7 +4626,6 @@ std::optional<EVP_PKEY_CTX*> EVPMDCtxPointer::verifyInitWithContext(
 #endif
 }
 
->>>>>>> nodejs/node:deps/ncrypto/ncrypto.cc@8385efc01343
 DataPointer EVPMDCtxPointer::signOneShot(
     const Buffer<const unsigned char>& buf) const {
   if (!ctx_) return {};