diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-09-03 14:27:19 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-11-24 15:25:43 +0000 |
| commit | 158e5207a794603f5d64ffa95e0247c7808ab445 (patch) | |
| tree | 48a704e49e80abab3ab3f9f384f58045146c118e /crypto/asn1/asn1_par.c | |
| parent | de17db915e26452819692fd837d788d52b8dd48a (diff) | |
| download | openssl-158e5207a794603f5d64ffa95e0247c7808ab445.tar.gz | |
Limit depth of ASN1 parse printing.
Thanks to Guido Vranken <guidovranken@gmail.com> for reporting this issue.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/asn1/asn1_par.c')
| -rw-r--r-- | crypto/asn1/asn1_par.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c index 9a370cd4bc..09dde15613 100644 --- a/crypto/asn1/asn1_par.c +++ b/crypto/asn1/asn1_par.c @@ -62,6 +62,10 @@ #include <openssl/objects.h> #include <openssl/asn1.h> +#ifndef ASN1_PARSE_MAXDEPTH +#define ASN1_PARSE_MAXDEPTH 128 +#endif + static int asn1_print_info(BIO *bp, int tag, int xclass, int constructed, int indent); static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, @@ -123,6 +127,11 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, /* ASN1_BMPSTRING *bmp=NULL; */ int dump_indent; + if (depth > ASN1_PARSE_MAXDEPTH) { + BIO_puts(bp, "BAD RECURSION DEPTH\n"); + goto end; + } + dump_indent = 6; /* Because we know BIO_dump_indent() */ p = *pp; tot = p + length; |