summaryrefslogtreecommitdiff
path: root/Cryptlib/OpenSSL/crypto/asn1/asn1_lib.c
diff options
context:
space:
mode:
authorGary Ching-Pang Lin <glin@suse.com>2014-08-19 12:15:00 +0800
committerPeter Jones <pjones@redhat.com>2014-08-19 14:20:23 -0400
commit21f96e586351fc8b535353f2dea7c784e931d14a (patch)
treec7028a2687dcc1ce83f2b3bfdf25d0a3f9af7aa1 /Cryptlib/OpenSSL/crypto/asn1/asn1_lib.c
parentfa525bc4632e04346fae82a98ce23b31c6cfc86d (diff)
downloadefi-boot-shim-21f96e586351fc8b535353f2dea7c784e931d14a.tar.gz
efi-boot-shim-21f96e586351fc8b535353f2dea7c784e931d14a.zip
Update openssl to 0.9.8zb
Also update to Tiano Cryptlib r15802 and remove the execute mode bits from the C and header files of openssl
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),