[openssl] master update

[tomas at openssl.org]

The branch master has been updated
       via  b089d546242bbc073aefb6f6471586e484118863 (commit)
      from  ba0b60c632ae9c5590b59184281baaf0a39f0c24 (commit)


- Log -----------------------------------------------------------------
commit b089d546242bbc073aefb6f6471586e484118863
Author: Armin Fuerst <armin at fuerst.priv.at>
Date:   Fri Feb 11 19:46:12 2022 +0100

    Prefix output to avoid random ok to confuse test parser
    
    Prefix output of generated dh parameters to avoid misinterpretation
    of lines beginning with ok[^a-zA-Z0-9] as a testresult.
    
    Also corrected indent and removed useless comma after last item.
    
    Fixes #17480
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17689)

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

Summary of changes:
 test/recipes/15-test_gendhparam.t | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/recipes/15-test_gendhparam.t b/test/recipes/15-test_gendhparam.t
index b95695b4dc..37178af643 100644
--- a/test/recipes/15-test_gendhparam.t
+++ b/test/recipes/15-test_gendhparam.t
@@ -118,12 +118,12 @@ my @testdata = (
 #        expect => [ 'BEGIN DH PARAMETERS', 'G:    5' ],
 #        message   => 'DH safe prime generator using an alias',
 #    },
-     {
+    {
         algorithm => 'DHX',
         pkeyopts => [ 'type:generator', 'safeprime-generator:5'],
         expect => [ 'ERROR' ],
         message   => 'safe prime generator should fail for DHX',
-    },
+    }
 );
 
 plan skip_all => "DH isn't supported in this build" if disabled("dh");
@@ -165,7 +165,7 @@ sub compareline {
     }
     print "-----------------\n";
     foreach (@lines) {
-        print $_;
+        print "# ".$_;
     }
     print "-----------------\n";
     foreach my $ex (@expected) {