diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-07-02 00:57:57 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-07-02 01:01:55 +0100 |
| commit | 00e86a74bd207f046dde8d9fdc9fb8f236104509 (patch) | |
| tree | c98cc3dd6506f8ea76f7b8a28692f7dfb377d023 | |
| parent | 9e6857a358282727a4ceea31e1db3dbc8e394bf8 (diff) | |
ASN1 sanity check.
Primitive encodings shouldn't use indefinite length constructed
form.
PR#2438 (partial).
(cherry picked from commit 398e99fe5e06edb11f55a39ce0883d9aa633ffa9)
| -rw-r--r-- | crypto/asn1/asn1_lib.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crypto/asn1/asn1_lib.c b/crypto/asn1/asn1_lib.c index 5af559ef8d..d34515577e 100644 --- a/crypto/asn1/asn1_lib.c +++ b/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), |