fixup!

nodejs · Jan 25, 2021 · f9922c0 · f9922c0
1 parent 4398605
commit f9922c0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/crypto/crypto_ecdh.cc b/src/crypto/crypto_ecdh.cc
@@ -39,6 +39,22 @@ int GetCurveFromName(const char* name) {
   return nid;
 }
 
+int GetOKPCurveFromName(const char* name) {
+  int nid;
+  if (strcmp(name, "NODE-ED25519") == 0) {
+    nid = EVP_PKEY_ED25519;
+  } else if (strcmp(name, "NODE-ED448") == 0) {
+    nid = EVP_PKEY_ED448;
+  } else if (strcmp(name, "NODE-X25519") == 0) {
+    nid = EVP_PKEY_X25519;
+  } else if (strcmp(name, "NODE-X448") == 0) {
+    nid = EVP_PKEY_X448;
+  } else {
+    nid = NID_undef;
+  }
+  return nid;
+}
+
 void ECDH::Initialize(Environment* env, Local<Object> target) {
   Local<FunctionTemplate> t = env->NewFunctionTemplate(New);
   t->Inherit(BaseObject::GetConstructorTemplate(env));
@@ -431,7 +447,7 @@ Maybe<bool> ECDHBitsTraits::AdditionalConfig(
     return Nothing<bool>();
   }
 
-  params->id_ = GetCurveFromName(*name);
+  params->id_ = GetOKPCurveFromName(*name);
   params->private_ = private_key->Data();
   params->public_ = public_key->Data();
 

diff --git a/src/crypto/crypto_ecdh.h b/src/crypto/crypto_ecdh.h
@@ -17,6 +17,7 @@
 namespace node {
 namespace crypto {
 int GetCurveFromName(const char* name);
+int GetOKPCurveFromName(const char* name);
 
 class ECDH final : public BaseObject {
  public:

diff --git a/src/crypto/crypto_keys.cc b/src/crypto/crypto_keys.cc
@@ -1058,7 +1058,7 @@ void KeyObjectHandle::InitEDRaw(const FunctionCallbackInfo<Value>& args) {
       ? EVP_PKEY_new_raw_private_key
       : EVP_PKEY_new_raw_public_key;
 
-  int id = GetCurveFromName(*name);
+  int id = GetOKPCurveFromName(*name);
 
   switch (id) {
     case EVP_PKEY_X25519: