[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  6e34a1048ce4871371eac224b995c3b4338f6166 (commit)
      from  abded2ced44b94d96f08ea5cf01df6519b80f5d3 (commit)


- Log -----------------------------------------------------------------
commit 6e34a1048ce4871371eac224b995c3b4338f6166
Author: Richard Levitte <levitte at openssl.org>
Date:   Sat Mar 20 09:09:40 2021 +0100

    ASN1: Reset the content dump flag after dumping
    
    When encountering a badly coded item, the DER printer (ASN1_print_dump())
    sets a flag to ensure that an additional hex dump of the offending content
    is printed as part of the output.  Unfortunately, this flag is never reset,
    which means that all following items are printed with the extra hex dump,
    whether they are faulty or not.
    
    Resetting the flag after hex dumping ensures that only the faulty contents
    are printed with the additional hex dump.
    
    Fixes #14626
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14627)

-----------------------------------------------------------------------

Summary of changes:
 crypto/asn1/asn1_par.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/asn1/asn1_par.c b/crypto/asn1/asn1_par.c
index cf6d48ce10..c51a8f7571 100644
--- a/crypto/asn1/asn1_par.c
+++ b/crypto/asn1/asn1_par.c
@@ -337,6 +337,7 @@ static int asn1_parse2(BIO *bp, const unsigned char **pp, long length,
                 }
                 if (BIO_puts(bp, "]") <= 0)
                     goto end;
+                dump_cont = 0;
             }
 
             if (!nl) {