diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-06-08 13:23:00 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-06-08 21:47:24 +0100 |
| commit | 228806a4f3c42cfb304b974a267a95f7a12cba87 (patch) | |
| tree | 699f3258857a56373c59f155e3b28e211b925b37 | |
| parent | bb82db1c776ec85b9a63f79fa04b001fb7d46fc7 (diff) | |
| download | openssl-228806a4f3c42cfb304b974a267a95f7a12cba87.tar.gz | |
return correct NID for undefined object
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 0fb9990480919163cc375a2b6c0df1d8d901a77b)
| -rw-r--r-- | crypto/objects/obj_dat.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c index e42a1c147d..454733db89 100644 --- a/crypto/objects/obj_dat.c +++ b/crypto/objects/obj_dat.c @@ -415,6 +415,9 @@ int OBJ_obj2nid(const ASN1_OBJECT *a) 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 */ |