[cherry-pick] src: check curve ID existence instead of asn flags

Simplify the code. The flag check was in the OpenSSL source, but reading through the docs and source, it is not necessary. Refs: https://github.com/nodejs/node/pull/24358/files#r243099693 PR-URL: nodejs/node#25345 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
electron · Mar 18, 2019 · 0186818 · 0186818
1 parent a673eac
commit 0186818
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -1756,21 +1756,18 @@ static Local<Object> X509ToObject(Environment* env, X509* cert) {
       CHECK_NULL(pub);
     }
 
-    if (EC_GROUP_get_asn1_flag(group) != 0) {
+    const int nid = EC_GROUP_get_curve_name(group);
+    if (nid != 0) {
       // Curve is well-known, get its OID and NIST nick-name (if it has one).
 
-      int nid = EC_GROUP_get_curve_name(group);
-      if (nid != 0) {
-        if (const char* sn = OBJ_nid2sn(nid)) {
-          info->Set(context, env->asn1curve_string(),
-                    OneByteString(env->isolate(), sn)).FromJust();
-        }
+      if (const char* sn = OBJ_nid2sn(nid)) {
+        info->Set(context, env->asn1curve_string(),
+                  OneByteString(env->isolate(), sn)).FromJust();
       }
-      if (nid != 0) {
-        if (const char* nist = EC_curve_nid2nist(nid)) {
-          info->Set(context, env->nistcurve_string(),
-                    OneByteString(env->isolate(), nist)).FromJust();
-        }
+
+      if (const char* nist = EC_curve_nid2nist(nid)) {
+        info->Set(context, env->nistcurve_string(),
+                  OneByteString(env->isolate(), nist)).FromJust();
       }
     } else {
       // Unnamed curves can be described by their mathematical properties,