[openssl] OpenSSL_1_1_1-stable update

[Richard Levitte]

The branch OpenSSL_1_1_1-stable has been updated
       via  ffefffa000437da5703dd8a173386623304b055d (commit)
      from  b402f00ee26157ad4e7e6e52f3a736743e3de46f (commit)


- Log -----------------------------------------------------------------
commit ffefffa000437da5703dd8a173386623304b055d
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)
    
    (cherry picked from commit 6e34a1048ce4871371eac224b995c3b4338f6166)

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

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 3f10c7cb94..d45f810bce 100644
--- a/crypto/asn1/asn1_par.c
+++ b/crypto/asn1/asn1_par.c
@@ -325,6 +325,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) {