diff options
| author | Mike DePaulo <mikedep333@gmail.com> | 2014-09-01 17:44:28 -0400 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2014-09-01 17:44:28 -0400 |
| commit | f13663bcc1a0d7b86a29e52e0a0d5bd746bc4d21 (patch) | |
| tree | fd03f01d13342419f0ebaf53daa0161a072a8d62 /openssl/crypto/asn1/asn1_lib.c | |
| parent | cf84b2dc07ef59c1adb4fe29789c7dbbbd35fbb4 (diff) | |
| download | vcxsrv-f13663bcc1a0d7b86a29e52e0a0d5bd746bc4d21.tar.gz vcxsrv-f13663bcc1a0d7b86a29e52e0a0d5bd746bc4d21.tar.bz2 vcxsrv-f13663bcc1a0d7b86a29e52e0a0d5bd746bc4d21.zip | |
Update OpenSSL from 1.0.1h to 1.0.1i
Diffstat (limited to 'openssl/crypto/asn1/asn1_lib.c')
| -rw-r--r-- | openssl/crypto/asn1/asn1_lib.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/openssl/crypto/asn1/asn1_lib.c b/openssl/crypto/asn1/asn1_lib.c index 1bcb44aee..fa04b08ed 100644 --- a/openssl/crypto/asn1/asn1_lib.c +++ b/openssl/crypto/asn1/asn1_lib.c @@ -131,6 +131,9 @@ int ASN1_get_object(const unsigned char **pp, long *plength, int *ptag, *pclass=xclass; if (!asn1_get_length(&p,&inf,plength,(int)max)) goto err; + if (inf && !(ret & V_ASN1_CONSTRUCTED)) + goto err; + #if 0 fprintf(stderr,"p=%d + *plength=%ld > omax=%ld + *pp=%d (%d > %d)\n", (int)p,*plength,omax,(int)*pp,(int)(p+ *plength), |