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:30:40 +0000 |
| commit | 275502eb41dbfc02910e48f6e55e65ea163854b9 (patch) | |
| tree | 5ee4dd366230baa8054ba780824755d3d6c6a9f1 | |
| parent | d7ebdc2e98f7cc1df99fd7dd675bb6cfd6adb1ba (diff) | |
Limit depth of ASN1 parse printing.
Thanks to Guido Vranken <guidovranken@gmail.com> for reporting this issue.
Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 158e5207a794603f5d64ffa95e0247c7808ab445)
Conflicts:
crypto/asn1/asn1_par.c
| -rw-r--r-- | crypto/asn1/asn1_par.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c index f6cd4b2b8c..4e8e25470f 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, @@ -128,6 +132,12 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length, #else dump_indent = 6; /* Because we know BIO_dump_indent() */ #endif + + if (depth > ASN1_PARSE_MAXDEPTH) { + BIO_puts(bp, "BAD RECURSION DEPTH\n"); + goto end; + } + p = *pp; tot = p + length; op = p - 1; |