1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: rename generateKeyPairEdDSA

Browse Source 
Now that support for X25519 and X448 has been added, this function is
not used exclusively for EdDSA keys anymore.

PR-URL: https://github.com/nodejs/node/pull/26900
Refs: https://github.com/nodejs/node/pull/26774
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
This commit is contained in:
Tobias Nießen 2019-03-25 10:51:11 +01:00
parent 230f1f2aa4
commit df1c9eb975
No known key found for this signature in database
GPG Key ID: 718207F8FD156B70
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/internal/crypto/keygen.js
View File

@ -5,7 +5,7 @@ const {
generateKeyPairRSA, generateKeyPairRSA,
generateKeyPairDSA, generateKeyPairDSA,
generateKeyPairEC, generateKeyPairEC,
generateKeyPairEdDSA, generateKeyPairNid,
EVP_PKEY_ED25519, EVP_PKEY_ED25519,
EVP_PKEY_ED448, EVP_PKEY_ED448,
EVP_PKEY_X25519, EVP_PKEY_X25519,
@ -217,10 +217,10 @@ function check(type, options, callback) {
id = EVP_PKEY_X448; id = EVP_PKEY_X448;
break; break;
} }
impl = (wrap) => generateKeyPairEdDSA(id, impl = (wrap) => generateKeyPairNid(id,
publicFormat, publicType, publicFormat, publicType,
privateFormat, privateType, privateFormat, privateType,
cipher, passphrase, wrap); cipher, passphrase, wrap);
} }
break; break;
default: default:

10
src/node_crypto.cc
View File

@ -5835,9 +5835,9 @@ class ECKeyPairGenerationConfig : public KeyPairGenerationConfig {
const int param_encoding_; const int param_encoding_;
}; };
class EdDSAKeyPairGenerationConfig : public KeyPairGenerationConfig { class NidKeyPairGenerationConfig : public KeyPairGenerationConfig {
public: public:
explicit EdDSAKeyPairGenerationConfig(int id) : id_(id) {} explicit NidKeyPairGenerationConfig(int id) : id_(id) {}
EVPKeyCtxPointer Setup() override { EVPKeyCtxPointer Setup() override {
return EVPKeyCtxPointer(EVP_PKEY_CTX_new_id(id_, nullptr)); return EVPKeyCtxPointer(EVP_PKEY_CTX_new_id(id_, nullptr));
@ -6020,11 +6020,11 @@ void GenerateKeyPairEC(const FunctionCallbackInfo<Value>& args) {
GenerateKeyPair(args, 2, std::move(config)); GenerateKeyPair(args, 2, std::move(config));
} }
void GenerateKeyPairEdDSA(const FunctionCallbackInfo<Value>& args) { void GenerateKeyPairNid(const FunctionCallbackInfo<Value>& args) {
CHECK(args[0]->IsInt32()); CHECK(args[0]->IsInt32());
const int id = args[0].As<Int32>()->Value(); const int id = args[0].As<Int32>()->Value();
std::unique_ptr<KeyPairGenerationConfig> config( std::unique_ptr<KeyPairGenerationConfig> config(
new EdDSAKeyPairGenerationConfig(id)); new NidKeyPairGenerationConfig(id));
GenerateKeyPair(args, 1, std::move(config)); GenerateKeyPair(args, 1, std::move(config));
} }
@ -6447,7 +6447,7 @@ void Initialize(Local<Object> target,
env->SetMethod(target, "generateKeyPairRSA", GenerateKeyPairRSA); env->SetMethod(target, "generateKeyPairRSA", GenerateKeyPairRSA);
env->SetMethod(target, "generateKeyPairDSA", GenerateKeyPairDSA); env->SetMethod(target, "generateKeyPairDSA", GenerateKeyPairDSA);
env->SetMethod(target, "generateKeyPairEC", GenerateKeyPairEC); 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_ED25519);
NODE_DEFINE_CONSTANT(target, EVP_PKEY_ED448); NODE_DEFINE_CONSTANT(target, EVP_PKEY_ED448);
NODE_DEFINE_CONSTANT(target, EVP_PKEY_X25519); NODE_DEFINE_CONSTANT(target, EVP_PKEY_X25519);