Skip to content

Commit f9922c0

Browse files
committed
fixup!
1 parent 4398605 commit f9922c0

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

src/crypto/crypto_ecdh.cc

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,22 @@ int GetCurveFromName(const char* name) {
3939
return nid;
4040
}
4141

42+
int GetOKPCurveFromName(const char* name) {
43+
int nid;
44+
if (strcmp(name, "NODE-ED25519") == 0) {
45+
nid = EVP_PKEY_ED25519;
46+
} else if (strcmp(name, "NODE-ED448") == 0) {
47+
nid = EVP_PKEY_ED448;
48+
} else if (strcmp(name, "NODE-X25519") == 0) {
49+
nid = EVP_PKEY_X25519;
50+
} else if (strcmp(name, "NODE-X448") == 0) {
51+
nid = EVP_PKEY_X448;
52+
} else {
53+
nid = NID_undef;
54+
}
55+
return nid;
56+
}
57+
4258
void ECDH::Initialize(Environment* env, Local<Object> target) {
4359
Local<FunctionTemplate> t = env->NewFunctionTemplate(New);
4460
t->Inherit(BaseObject::GetConstructorTemplate(env));
@@ -431,7 +447,7 @@ Maybe<bool> ECDHBitsTraits::AdditionalConfig(
431447
return Nothing<bool>();
432448
}
433449

434-
params->id_ = GetCurveFromName(*name);
450+
params->id_ = GetOKPCurveFromName(*name);
435451
params->private_ = private_key->Data();
436452
params->public_ = public_key->Data();
437453

src/crypto/crypto_ecdh.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
namespace node {
1818
namespace crypto {
1919
int GetCurveFromName(const char* name);
20+
int GetOKPCurveFromName(const char* name);
2021

2122
class ECDH final : public BaseObject {
2223
public:

src/crypto/crypto_keys.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ void KeyObjectHandle::InitEDRaw(const FunctionCallbackInfo<Value>& args) {
10581058
? EVP_PKEY_new_raw_private_key
10591059
: EVP_PKEY_new_raw_public_key;
10601060

1061-
int id = GetCurveFromName(*name);
1061+
int id = GetOKPCurveFromName(*name);
10621062

10631063
switch (id) {
10641064
case EVP_PKEY_X25519:

0 commit comments

Comments
 (0)