summaryrefslogtreecommitdiff
path: root/Cryptlib/OpenSSL/crypto/asn1/asn1_lib.c
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>2015-05-06 09:50:11 -0400
committerMathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>2015-05-06 09:50:11 -0400
commit4c03444e7c971185c20fa102eb09b707aea0d4d4 (patch)
treec8402158f0090f45bb46b9b539d981633e509f9a /Cryptlib/OpenSSL/crypto/asn1/asn1_lib.c
parent2283f5e85dbc78dd10810cb6ebfa39e61ab6759e (diff)
parenta14921c5944c340056312f2f5b1728d698f628b1 (diff)
downloadefi-boot-shim-4c03444e7c971185c20fa102eb09b707aea0d4d4.tar.gz
efi-boot-shim-4c03444e7c971185c20fa102eb09b707aea0d4d4.zip
New upstream release.
Diffstat (limited to 'Cryptlib/OpenSSL/crypto/asn1/asn1_lib.c')
-rw-r--r--[-rwxr-xr-x]Cryptlib/OpenSSL/crypto/asn1/asn1_lib.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Cryptlib/OpenSSL/crypto/asn1/asn1_lib.c b/Cryptlib/OpenSSL/crypto/asn1/asn1_lib.c
index 5af559ef..d3451557 100755..100644
--- a/Cryptlib/OpenSSL/crypto/asn1/asn1_lib.c
+++ b/Cryptlib/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),