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@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17689)
This commit is contained in:
Armin Fuerst 2022-02-11 19:46:12 +01:00 committed by Tomas Mraz
parent ba0b60c632
commit b089d54624

View File

@ -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) {