[openssl-commits] [openssl] master update
Dr. Stephen Henson
steve at openssl.org
Mon Jun 8 20:46:10 UTC 2015
The branch master has been updated
via 0fb9990480919163cc375a2b6c0df1d8d901a77b (commit)
from 2974e3d4641b80c76197e653a016e7c010eaf3a2 (commit)
- Log -----------------------------------------------------------------
commit 0fb9990480919163cc375a2b6c0df1d8d901a77b
Author: Dr. Stephen Henson <steve at openssl.org>
Date: Mon Jun 8 13:23:00 2015 +0100
return correct NID for undefined object
Reviewed-by: Tim Hudson <tjh at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
crypto/objects/obj_dat.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 27d61b3..e8a6b13 100644
--- 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->length == 0)
+ return NID_undef;
+
if (added != NULL) {
ad.type = ADDED_DATA;
ad.obj = (ASN1_OBJECT *)a; /* XXX: ugly but harmless */
More information about the openssl-commits
mailing list