@@ -452,17 +452,11 @@ void AddFingerprintDigest(
452
452
}
453
453
}
454
454
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)) :
466
460
MaybeLocal<Value>(Undefined (env->isolate ()));
467
461
}
468
462
@@ -1413,11 +1407,11 @@ MaybeLocal<Object> X509ToObject(
1413
1407
if (!Set<Value>(context,
1414
1408
info,
1415
1409
env->asn1curve_string (),
1416
- GetCurveASN1Name (env, nid)) ||
1410
+ GetCurveName<OBJ_nid2sn> (env, nid)) ||
1417
1411
!Set<Value>(context,
1418
1412
info,
1419
1413
env->nistcurve_string (),
1420
- GetCurveNistName (env, nid))) {
1414
+ GetCurveName<EC_curve_nid2nist> (env, nid))) {
1421
1415
return MaybeLocal<Object>();
1422
1416
}
1423
1417
} else {
0 commit comments