summaryrefslogtreecommitdiff
path: root/crypto/objects
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2015-06-11 18:03:37 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2015-06-11 18:03:37 +0000
commitd7a2d00e5375699d95f3720a7b779ded3c805b5f (patch)
treece015b962f950e2fd404fdd6180b3cbdff9eb335 /crypto/objects
parenta46f5e3e504e070c9b4803e9bd1572a33e0987a8 (diff)
Import OpenSSL 0.9.8zg.vendor/openssl/0.9.8zg
Notes
svn path=/vendor-crypto/openssl/dist-0.9.8/; revision=284281 svn path=/vendor-crypto/openssl/0.9.8zg/; revision=284282; tag=vendor/openssl/0.9.8zg
Diffstat (limited to 'crypto/objects')
-rw-r--r--crypto/objects/obj_dat.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/objects/obj_dat.c b/crypto/objects/obj_dat.c
index 9654775a476e..b7d1b8351b68 100644
--- a/crypto/objects/obj_dat.c
+++ b/crypto/objects/obj_dat.c
@@ -382,6 +382,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 */