return correct NID for undefined object

Reviewed-by: Tim Hudson <tjh@openssl.org>

diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 27d61b3a43a866b6bd599595fe6d35b069fd3b56..e8a6b139ddad7b52dbae94499a75c19e8c9f76bb 100644 (file)
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -397,6 +397,9 @@ int OBJ_obj2nid(const ASN1_OBJECT *a)
     if (a->nid != 0)
         return (a->nid);
 
     if (a->nid != 0)
         return (a->nid);
 

+    if (a->length == 0)
+        return NID_undef;
+

     if (added != NULL) {
         ad.type = ADDED_DATA;
         ad.obj = (ASN1_OBJECT *)a; /* XXX: ugly but harmless */
     if (added != NULL) {
         ad.type = ADDED_DATA;
         ad.obj = (ASN1_OBJECT *)a; /* XXX: ugly but harmless */