fixup! crypto: support ML-KEM, DHKEM, and RSASVE key encapsulation mechanisms

Author: panva

deps/ncrypto/ncrypto.h

@@ -1589,13 +1589,13 @@ class KEM final {
         : 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
+  // 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
+  // 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);
 

doc/api/errors.md

@@ -1076,16 +1076,6 @@ added: REPLACEME
 Attempted to use KEM operations while Node.js was not compiled with
 OpenSSL with KEM support.
 
-<a id="ERR_CRYPTO_KEY_REQUIRED"></a>
-
-### `ERR_CRYPTO_KEY_REQUIRED`
-
-<!-- YAML
-added: REPLACEME
--->
-
-A `key` was not provided.
-
 <a id="ERR_CRYPTO_OPERATION_FAILED"></a>
 
 ### `ERR_CRYPTO_OPERATION_FAILED`

lib/internal/crypto/kem.js

@@ -7,7 +7,6 @@ const {
 const {
   codes: {
     ERR_CRYPTO_KEM_NOT_SUPPORTED,
-    ERR_CRYPTO_KEY_REQUIRED,
   },
 } = require('internal/errors');
 
@@ -35,9 +34,6 @@ function encapsulate(key, callback) {
   if (!KEMEncapsulateJob)
     throw new ERR_CRYPTO_KEM_NOT_SUPPORTED();
 
-  if (!key)
-    throw new ERR_CRYPTO_KEY_REQUIRED();
-
   if (callback !== undefined)
     validateFunction(callback, 'callback');
 
@@ -75,21 +71,18 @@ function decapsulate(key, ciphertext, callback) {
   if (!KEMDecapsulateJob)
     throw new ERR_CRYPTO_KEM_NOT_SUPPORTED();
 
-  if (!key)
-    throw new ERR_CRYPTO_KEY_REQUIRED();
-
   if (callback !== undefined)
     validateFunction(callback, 'callback');
 
-  ciphertext = getArrayBufferOrView(ciphertext, 'ciphertext');
-
   const {
     data: keyData,
     format: keyFormat,
     type: keyType,
     passphrase: keyPassphrase,
   } = preparePrivateKey(key);
 
+  ciphertext = getArrayBufferOrView(ciphertext, 'ciphertext');
+
   const job = new KEMDecapsulateJob(
     callback ? kCryptoJobAsync : kCryptoJobSync,
     keyData,

lib/internal/errors.js

@@ -1185,7 +1185,6 @@ E('ERR_CRYPTO_INVALID_KEY_OBJECT_TYPE',
   'Invalid key object type %s, expected %s.', TypeError);
 E('ERR_CRYPTO_INVALID_STATE', 'Invalid state for operation %s', Error);
 E('ERR_CRYPTO_KEM_NOT_SUPPORTED', 'KEM is not supported', Error);
-E('ERR_CRYPTO_KEY_REQUIRED', 'No key provided', Error);
 E('ERR_CRYPTO_PBKDF2_ERROR', 'PBKDF2 error', Error);
 E('ERR_CRYPTO_SCRYPT_NOT_SUPPORTED', 'Scrypt algorithm not supported', Error);
 // Switch to TypeError. The current implementation does not seem right.

src/crypto/crypto_kem.cc

@@ -174,7 +174,7 @@ MaybeLocal<Value> KEMEncapsulateTraits::EncodeOutput(
     return MaybeLocal<Value>();
   }
 
-  // Return an array [sharedKey, ciphertext]
+  // Return an array [sharedKey, ciphertext].
   Local<Array> result = Array::New(env->isolate(), 2);
   if (result->Set(env->context(), 0, shared_key_obj).IsNothing() ||
       result->Set(env->context(), 1, ciphertext_obj).IsNothing()) {

test/parallel/test-crypto-encap-decap.js

@@ -14,8 +14,10 @@ if (!hasOpenSSL(3)) {
   return;
 }
 
-assert.throws(() => crypto.encapsulate(), { code: 'ERR_CRYPTO_KEY_REQUIRED' });
-assert.throws(() => crypto.decapsulate(), { code: 'ERR_CRYPTO_KEY_REQUIRED' });
+assert.throws(() => crypto.encapsulate(), { code: 'ERR_INVALID_ARG_TYPE',
+                                            message: /The "key" argument must be of type/ });
+assert.throws(() => crypto.decapsulate(), { code: 'ERR_INVALID_ARG_TYPE',
+                                            message: /The "key" argument must be of type/ });
 
 const keys = {
   'rsa': {