Commit 275502eb authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Limit depth of ASN1 parse printing. 



Thanks to Guido Vranken <guidovranken@gmail.com> for reporting this issue.

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(cherry picked from commit 158e5207)

Conflicts:
	crypto/asn1/asn1_par.c
parent d7ebdc2e

crypto/asn1/asn1_par.c

+10 −0
Original line number Diff line number Diff line
@@ -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;