Skip to content

Commit c1d02c6

Browse files
tniessentargos
authored andcommitted
crypto: rename generateKeyPairEdDSA
Now that support for X25519 and X448 has been added, this function is not used exclusively for EdDSA keys anymore. PR-URL: #26900 Refs: #26774 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ruben Bridgewater <[email protected]> Reviewed-By: Sam Roberts <[email protected]>
1 parent 385c0b0 commit c1d02c6

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

lib/internal/crypto/keygen.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const {
55
generateKeyPairRSA,
66
generateKeyPairDSA,
77
generateKeyPairEC,
8-
generateKeyPairEdDSA,
8+
generateKeyPairNid,
99
EVP_PKEY_ED25519,
1010
EVP_PKEY_ED448,
1111
EVP_PKEY_X25519,
@@ -217,10 +217,10 @@ function check(type, options, callback) {
217217
id = EVP_PKEY_X448;
218218
break;
219219
}
220-
impl = (wrap) => generateKeyPairEdDSA(id,
221-
publicFormat, publicType,
222-
privateFormat, privateType,
223-
cipher, passphrase, wrap);
220+
impl = (wrap) => generateKeyPairNid(id,
221+
publicFormat, publicType,
222+
privateFormat, privateType,
223+
cipher, passphrase, wrap);
224224
}
225225
break;
226226
default:

src/node_crypto.cc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5725,9 +5725,9 @@ class ECKeyPairGenerationConfig : public KeyPairGenerationConfig {
57255725
const int param_encoding_;
57265726
};
57275727

5728-
class EdDSAKeyPairGenerationConfig : public KeyPairGenerationConfig {
5728+
class NidKeyPairGenerationConfig : public KeyPairGenerationConfig {
57295729
public:
5730-
explicit EdDSAKeyPairGenerationConfig(int id) : id_(id) {}
5730+
explicit NidKeyPairGenerationConfig(int id) : id_(id) {}
57315731

57325732
EVPKeyCtxPointer Setup() override {
57335733
return EVPKeyCtxPointer(EVP_PKEY_CTX_new_id(id_, nullptr));
@@ -5910,11 +5910,11 @@ void GenerateKeyPairEC(const FunctionCallbackInfo<Value>& args) {
59105910
GenerateKeyPair(args, 2, std::move(config));
59115911
}
59125912

5913-
void GenerateKeyPairEdDSA(const FunctionCallbackInfo<Value>& args) {
5913+
void GenerateKeyPairNid(const FunctionCallbackInfo<Value>& args) {
59145914
CHECK(args[0]->IsInt32());
59155915
const int id = args[0].As<Int32>()->Value();
59165916
std::unique_ptr<KeyPairGenerationConfig> config(
5917-
new EdDSAKeyPairGenerationConfig(id));
5917+
new NidKeyPairGenerationConfig(id));
59185918
GenerateKeyPair(args, 1, std::move(config));
59195919
}
59205920

@@ -6315,7 +6315,7 @@ void Initialize(Local<Object> target,
63156315
env->SetMethod(target, "generateKeyPairRSA", GenerateKeyPairRSA);
63166316
env->SetMethod(target, "generateKeyPairDSA", GenerateKeyPairDSA);
63176317
env->SetMethod(target, "generateKeyPairEC", GenerateKeyPairEC);
6318-
env->SetMethod(target, "generateKeyPairEdDSA", GenerateKeyPairEdDSA);
6318+
env->SetMethod(target, "generateKeyPairNid", GenerateKeyPairNid);
63196319
NODE_DEFINE_CONSTANT(target, EVP_PKEY_ED25519);
63206320
NODE_DEFINE_CONSTANT(target, EVP_PKEY_ED448);
63216321
NODE_DEFINE_CONSTANT(target, EVP_PKEY_X25519);

0 commit comments

Comments
 (0)