diff options
| author | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-06-12 00:00:05 +0900 |
|---|---|---|
| committer | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-06-12 09:47:44 +0900 |
| commit | c21b24decf6fef3d808cdf1e2fa58be156898d65 (patch) | |
| tree | 3c4cfc597b96b6fbb1c1f18bce4693396c97b32d /deps/openssl/openssl/crypto/objects/obj_dat.c | |
| parent | a6b8ee19b85bbd798510191f0aee596f36b909d2 (diff) | |
| download | android-node-v8-c21b24decf6fef3d808cdf1e2fa58be156898d65.tar.gz android-node-v8-c21b24decf6fef3d808cdf1e2fa58be156898d65.tar.bz2 android-node-v8-c21b24decf6fef3d808cdf1e2fa58be156898d65.zip | |
deps: upgrade openssl sources to 1.0.2b
This just replaces all sources of openssl-1.0.2b.tar.gz
into deps/openssl/openssl
Fixes: https://github.com/nodejs/io.js/issues/1921
PR-URL: https://github.com/nodejs/io.js/pull/1950
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/openssl/openssl/crypto/objects/obj_dat.c')
| -rw-r--r-- | deps/openssl/openssl/crypto/objects/obj_dat.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/deps/openssl/openssl/crypto/objects/obj_dat.c b/deps/openssl/openssl/crypto/objects/obj_dat.c index 5cd755d77d..aca382a6e9 100644 --- a/deps/openssl/openssl/crypto/objects/obj_dat.c +++ b/deps/openssl/openssl/crypto/objects/obj_dat.c @@ -400,6 +400,8 @@ static int obj_cmp(const ASN1_OBJECT *const *ap, const unsigned int *bp) j = (a->length - b->length); if (j) return (j); + if (a->length == 0) + return 0; return (memcmp(a->data, b->data, a->length)); } @@ -415,6 +417,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 */ |