diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2015-07-07 08:57:00 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-07-07 09:01:38 -0400 |
| commit | f65ff03d106f4cfe162bfde4780426b7bbc2e4ee (patch) | |
| tree | 571dd0bd95a0341fcb1817a3a17df69b1d43e3de /openssl/crypto/objects/obj_dat.c | |
| parent | 4241d28e545a02eb753c8f713149e20747f044b6 (diff) | |
| download | vcxsrv-f65ff03d106f4cfe162bfde4780426b7bbc2e4ee.tar.gz vcxsrv-f65ff03d106f4cfe162bfde4780426b7bbc2e4ee.tar.bz2 vcxsrv-f65ff03d106f4cfe162bfde4780426b7bbc2e4ee.zip | |
Update openssl: 1.0.1m -> 1.0.1o
Diffstat (limited to 'openssl/crypto/objects/obj_dat.c')
| -rw-r--r-- | openssl/crypto/objects/obj_dat.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/openssl/crypto/objects/obj_dat.c b/openssl/crypto/objects/obj_dat.c index e42a1c147..aca382a6e 100644 --- a/openssl/crypto/objects/obj_dat.c +++ b/openssl/crypto/objects/obj_dat.c @@ -142,7 +142,7 @@ static unsigned long added_obj_hash(const ADDED_OBJ *ca) return 0; } ret &= 0x3fffffffL; - ret |= ca->type << 30L; + ret |= ((unsigned long)ca->type) << 30L; return (ret); } @@ -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 */ |