diff --git a/lib/internal/crypto/keygen.js b/lib/internal/crypto/keygen.js index 80efa01b1b7aa1..e212f6f4516951 100644 --- a/lib/internal/crypto/keygen.js +++ b/lib/internal/crypto/keygen.js @@ -5,7 +5,7 @@ const { generateKeyPairRSA, generateKeyPairDSA, generateKeyPairEC, - generateKeyPairEdDSA, + generateKeyPairNid, EVP_PKEY_ED25519, EVP_PKEY_ED448, EVP_PKEY_X25519, @@ -217,10 +217,10 @@ function check(type, options, callback) { id = EVP_PKEY_X448; break; } - impl = (wrap) => generateKeyPairEdDSA(id, - publicFormat, publicType, - privateFormat, privateType, - cipher, passphrase, wrap); + impl = (wrap) => generateKeyPairNid(id, + publicFormat, publicType, + privateFormat, privateType, + cipher, passphrase, wrap); } break; default: diff --git a/src/node_crypto.cc b/src/node_crypto.cc index 91d06c8248b523..8b5e6dee2fc3ee 100644 --- a/src/node_crypto.cc +++ b/src/node_crypto.cc @@ -5835,9 +5835,9 @@ class ECKeyPairGenerationConfig : public KeyPairGenerationConfig { const int param_encoding_; }; -class EdDSAKeyPairGenerationConfig : public KeyPairGenerationConfig { +class NidKeyPairGenerationConfig : public KeyPairGenerationConfig { public: - explicit EdDSAKeyPairGenerationConfig(int id) : id_(id) {} + explicit NidKeyPairGenerationConfig(int id) : id_(id) {} EVPKeyCtxPointer Setup() override { return EVPKeyCtxPointer(EVP_PKEY_CTX_new_id(id_, nullptr)); @@ -6020,11 +6020,11 @@ void GenerateKeyPairEC(const FunctionCallbackInfo& args) { GenerateKeyPair(args, 2, std::move(config)); } -void GenerateKeyPairEdDSA(const FunctionCallbackInfo& args) { +void GenerateKeyPairNid(const FunctionCallbackInfo& args) { CHECK(args[0]->IsInt32()); const int id = args[0].As()->Value(); std::unique_ptr config( - new EdDSAKeyPairGenerationConfig(id)); + new NidKeyPairGenerationConfig(id)); GenerateKeyPair(args, 1, std::move(config)); } @@ -6447,7 +6447,7 @@ void Initialize(Local target, env->SetMethod(target, "generateKeyPairRSA", GenerateKeyPairRSA); env->SetMethod(target, "generateKeyPairDSA", GenerateKeyPairDSA); env->SetMethod(target, "generateKeyPairEC", GenerateKeyPairEC); - env->SetMethod(target, "generateKeyPairEdDSA", GenerateKeyPairEdDSA); + env->SetMethod(target, "generateKeyPairNid", GenerateKeyPairNid); NODE_DEFINE_CONSTANT(target, EVP_PKEY_ED25519); NODE_DEFINE_CONSTANT(target, EVP_PKEY_ED448); NODE_DEFINE_CONSTANT(target, EVP_PKEY_X25519);