Skip to content

Commit df1c9eb

Browse files
committed
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 230f1f2 commit df1c9eb

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
@@ -5835,9 +5835,9 @@ class ECKeyPairGenerationConfig : public KeyPairGenerationConfig{
58355835
constint param_encoding_;
58365836
};
58375837

5838-
classEdDSAKeyPairGenerationConfig : publicKeyPairGenerationConfig{
5838+
classNidKeyPairGenerationConfig : publicKeyPairGenerationConfig{
58395839
public:
5840-
explicitEdDSAKeyPairGenerationConfig(int id) : id_(id){}
5840+
explicitNidKeyPairGenerationConfig(int id) : id_(id){}
58415841

58425842
EVPKeyCtxPointer Setup() override{
58435843
returnEVPKeyCtxPointer(EVP_PKEY_CTX_new_id(id_, nullptr));
@@ -6020,11 +6020,11 @@ void GenerateKeyPairEC(const FunctionCallbackInfo<Value>& args){
60206020
GenerateKeyPair(args, 2, std::move(config));
60216021
}
60226022

6023-
voidGenerateKeyPairEdDSA(const FunctionCallbackInfo<Value>& args){
6023+
voidGenerateKeyPairNid(const FunctionCallbackInfo<Value>& args){
60246024
CHECK(args[0]->IsInt32());
60256025
constint id = args[0].As<Int32>()->Value();
60266026
std::unique_ptr<KeyPairGenerationConfig> config(
6027-
newEdDSAKeyPairGenerationConfig(id));
6027+
newNidKeyPairGenerationConfig(id));
60286028
GenerateKeyPair(args, 1, std::move(config));
60296029
}
60306030

@@ -6447,7 +6447,7 @@ void Initialize(Local<Object> target,
64476447
env->SetMethod(target, "generateKeyPairRSA", GenerateKeyPairRSA);
64486448
env->SetMethod(target, "generateKeyPairDSA", GenerateKeyPairDSA);
64496449
env->SetMethod(target, "generateKeyPairEC", GenerateKeyPairEC);
6450-
env->SetMethod(target, "generateKeyPairEdDSA", GenerateKeyPairEdDSA);
6450+
env->SetMethod(target, "generateKeyPairNid", GenerateKeyPairNid);
64516451
NODE_DEFINE_CONSTANT(target, EVP_PKEY_ED25519);
64526452
NODE_DEFINE_CONSTANT(target, EVP_PKEY_ED448);
64536453
NODE_DEFINE_CONSTANT(target, EVP_PKEY_X25519);

0 commit comments

Comments
(0)