summaryrefslogtreecommitdiff
path: root/main/openssl/crypto/asn1/asn1_lib.c
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-11-14 09:52:32 +0100
committerArne Schwabe <arne@rfc2549.org>2014-11-14 09:52:32 +0100
commitb28828796ad6d65ac463b41bba153f74e4531a6b (patch)
tree154b9f7436ae575e324f3374a5145e451bf649a8 /main/openssl/crypto/asn1/asn1_lib.c
parente7a6c1a987ebee1ddb2f908ca028d613a5c52490 (diff)
Update OpenSSL version
Diffstat (limited to 'main/openssl/crypto/asn1/asn1_lib.c')
-rw-r--r--main/openssl/crypto/asn1/asn1_lib.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/main/openssl/crypto/asn1/asn1_lib.c b/main/openssl/crypto/asn1/asn1_lib.c
index 1bcb44ae..fa04b08e 100644
--- a/main/openssl/crypto/asn1/asn1_lib.c
+++ b/main/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),