From 29fd5ff37d83f93d3e39b6e1091a8f4c453fe485 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
Date: Sun, 27 Feb 2022 15:24:52 +0100
Subject: [PATCH] src: combine GetCurveASN1Name and GetCurveNistName

PR-URL: https://github.com/nodejs/node/pull/42118
Reviewed-By: Filip Skokan <panva.ip@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
---
 src/crypto/crypto_common.cc | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/crypto/crypto_common.cc b/src/crypto/crypto_common.cc
index f3497f8ee008a7..468a0892132b14 100644
--- a/src/crypto/crypto_common.cc
+++ b/src/crypto/crypto_common.cc
@@ -434,17 +434,11 @@ void AddFingerprintDigest(
   }
 }
 
-MaybeLocal<Value> GetCurveASN1Name(Environment* env, const int nid) {
-  const char* nist = OBJ_nid2sn(nid);
-  return nist != nullptr ?
-      MaybeLocal<Value>(OneByteString(env->isolate(), nist)) :
-      MaybeLocal<Value>(Undefined(env->isolate()));
-}
-
-MaybeLocal<Value> GetCurveNistName(Environment* env, const int nid) {
-  const char* nist = EC_curve_nid2nist(nid);
-  return nist != nullptr ?
-      MaybeLocal<Value>(OneByteString(env->isolate(), nist)) :
+template <const char* (*nid2string)(int nid)>
+MaybeLocal<Value> GetCurveName(Environment* env, const int nid) {
+  const char* name = nid2string(nid);
+  return name != nullptr ?
+      MaybeLocal<Value>(OneByteString(env->isolate(), name)) :
       MaybeLocal<Value>(Undefined(env->isolate()));
 }
 
@@ -1425,11 +1419,11 @@ MaybeLocal<Object> X509ToObject(
       if (!Set<Value>(context,
                       info,
                       env->asn1curve_string(),
-                      GetCurveASN1Name(env, nid)) ||
+                      GetCurveName<OBJ_nid2sn>(env, nid)) ||
           !Set<Value>(context,
                       info,
                       env->nistcurve_string(),
-                      GetCurveNistName(env, nid))) {
+                      GetCurveName<EC_curve_nid2nist>(env, nid))) {
         return MaybeLocal<Object>();
       }
     } else {