Simplify OBJ_nid2ln()

If nid is in the range of built-in NIDs, return the corresponding
long name, unless some genius left a hole. Otherwise perform a yolo
check if there are any user-added objects with matching nid in the
global hash.

This changes behavior in that we now push an OBJ_R_UNKNOWN_NID error
onto the stack even if there are no user-added objects.

ok jsing

diff --git a/lib/libcrypto/objects/obj_dat.c b/lib/libcrypto/objects/obj_dat.c
index 14da516..505de36 100644 (file)
--- a/lib/libcrypto/objects/obj_dat.c
+++ b/lib/libcrypto/objects/obj_dat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: obj_dat.c,v 1.65 2023/12/13 23:34:45 tb Exp $ */
+/* $OpenBSD: obj_dat.c,v 1.66 2023/12/14 14:01:42 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -337,31 +337,34 @@ OBJ_nid2sn(int n)
 LCRYPTO_ALIAS(OBJ_nid2sn);
 
 const char *
-OBJ_nid2ln(int n)
+OBJ_nid2ln(int nid)
 {
-       ADDED_OBJ ad, *adp;
-       ASN1_OBJECT ob;
+       if (nid >= 0 && nid < NUM_NID) {
+               if (nid == NID_undef || nid_objs[nid].nid != NID_undef)
+                       return nid_objs[nid].ln;
 
-       if ((n >= 0) && (n < NUM_NID)) {
-               if ((n != NID_undef) && (nid_objs[n].nid == NID_undef)) {
-                       OBJerror(OBJ_R_UNKNOWN_NID);
-                       return (NULL);
-               }
-               return (nid_objs[n].ln);
-       } else if (added == NULL)
-               return (NULL);
-       else {
-               ad.type = ADDED_NID;
-               ad.obj = &ob;
-               ob.nid = n;
-               adp = lh_ADDED_OBJ_retrieve(added, &ad);
-               if (adp != NULL)
-                       return (adp->obj->ln);
-               else {
-                       OBJerror(OBJ_R_UNKNOWN_NID);
-                       return (NULL);
-               }
+               goto unknown;
+       }
+
+       /* XXX - locking. */
+       if (added != NULL) {
+               ASN1_OBJECT aobj = {
+                       .nid = nid,
+               };
+               ADDED_OBJ needle = {
+                       .type = ADDED_NID,
+                       .obj = &aobj,
+               };
+               ADDED_OBJ *found;
+
+               if ((found = lh_ADDED_OBJ_retrieve(added, &needle)) != NULL)
+                       return found->obj->ln;
        }
+
+ unknown:
+       OBJerror(OBJ_R_UNKNOWN_NID);
+
+       return NULL;
 }
 LCRYPTO_ALIAS(OBJ_nid2ln);