generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

return correct NID for undefined object

Browse Source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 0fb9990480919163cc375a2b6c0df1d8d901a77b)
This commit is contained in:
Dr. Stephen Henson 2015-06-08 13:23:00 +01:00
parent 05627d57e5
commit 34cdff92e9
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
crypto/objects/obj_dat.c
View File

@ -417,6 +417,9 @@ int OBJ_obj2nid(const ASN1_OBJECT *a)
if (a->nid != 0) if (a->nid != 0)
return (a->nid); return (a->nid);
if (a->length == 0)
return NID_undef;
if (added != NULL) { if (added != NULL) {
ad.type = ADDED_DATA; ad.type = ADDED_DATA;
ad.obj = (ASN1_OBJECT *)a; /* XXX: ugly but harmless */ ad.obj = (ASN1_OBJECT *)a; /* XXX: ugly but harmless */