Skip to content

Commit 9704e98

Browse files
committed
src: combine GetCurveASN1Name and GetCurveNistName
1 parent debd87c commit 9704e98

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

src/crypto/crypto_common.cc

+7-13
Original file line numberDiff line numberDiff line change
@@ -452,17 +452,11 @@ void AddFingerprintDigest(
452452
}
453453
}
454454

455-
MaybeLocal<Value> GetCurveASN1Name(Environment* env, const int nid) {
456-
const char* nist = OBJ_nid2sn(nid);
457-
return nist != nullptr ?
458-
MaybeLocal<Value>(OneByteString(env->isolate(), nist)) :
459-
MaybeLocal<Value>(Undefined(env->isolate()));
460-
}
461-
462-
MaybeLocal<Value> GetCurveNistName(Environment* env, const int nid) {
463-
const char* nist = EC_curve_nid2nist(nid);
464-
return nist != nullptr ?
465-
MaybeLocal<Value>(OneByteString(env->isolate(), nist)) :
455+
template <const char* (*nid2string)(int nid)>
456+
MaybeLocal<Value> GetCurveName(Environment* env, const int nid) {
457+
const char* name = nid2string(nid);
458+
return name != nullptr ?
459+
MaybeLocal<Value>(OneByteString(env->isolate(), name)) :
466460
MaybeLocal<Value>(Undefined(env->isolate()));
467461
}
468462

@@ -1413,11 +1407,11 @@ MaybeLocal<Object> X509ToObject(
14131407
if (!Set<Value>(context,
14141408
info,
14151409
env->asn1curve_string(),
1416-
GetCurveASN1Name(env, nid)) ||
1410+
GetCurveName<OBJ_nid2sn>(env, nid)) ||
14171411
!Set<Value>(context,
14181412
info,
14191413
env->nistcurve_string(),
1420-
GetCurveNistName(env, nid))) {
1414+
GetCurveName<EC_curve_nid2nist>(env, nid))) {
14211415
return MaybeLocal<Object>();
14221416
}
14231417
} else {

0 commit comments

Comments
 (0)