generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Recognise invalid enable/disable options.

Browse Source 
Option to shut up bogus warnings.
This commit is contained in:
Dr. Stephen Henson 2011-04-24 12:13:32 +00:00
parent c36ce81cf5
commit 7979626995
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fips/fipsalgtest.pl
View File

@ -461,6 +461,7 @@ my $list_tests = 0;
my $minimal_script = 0; my $minimal_script = 0;
my $outfile = ''; my $outfile = '';
my $no_warn_missing = 0; my $no_warn_missing = 0;
my $no_warn_bogus = 0;
my %fips_enabled = ( my %fips_enabled = (
dsa => 1, dsa => 1,
@ -479,7 +480,7 @@ my %fips_enabled = (
"des3-cfb1" => 0, "des3-cfb1" => 0,
drbg => 0, drbg => 0,
ccm => 0, ccm => 0,
xts => 0, "aes-xts" => 0,
gcm => 0, gcm => 0,
dh => 0, dh => 0,
ecdh => 0, ecdh => 0,
@ -502,6 +503,10 @@ foreach (@ARGV) {
elsif ( $_ eq "--ignore-missing" ) { elsif ( $_ eq "--ignore-missing" ) {
$ignore_missing = 1; $ignore_missing = 1;
} }
elsif ( $_ eq "--quiet-bogus" ) {
$ignore_bogus = 1;
$no_warn_bogus = 1;
}
elsif ( $_ eq "--ignore-bogus" ) { elsif ( $_ eq "--ignore-bogus" ) {
$ignore_bogus = 1; $ignore_bogus = 1;
} }
@ -532,6 +537,7 @@ foreach (@ARGV) {
elsif (/^--(enable|disable)-(.*)$/) { elsif (/^--(enable|disable)-(.*)$/) {
if ( !exists $fips_enabled{$2} ) { if ( !exists $fips_enabled{$2} ) {
print STDERR "Unknown test $2\n"; print STDERR "Unknown test $2\n";
exit(1);
} }
if ( $1 eq "enable" ) { if ( $1 eq "enable" ) {
$fips_enabled{$2} = 1; $fips_enabled{$2} = 1;
@ -741,7 +747,7 @@ sub find_files {
} }
} }
else { else {
print STDERR "WARNING: bogus file $_\n"; print STDERR "WARNING: bogus file $_\n" unless $no_warn_bogus;
$nbogus++; $nbogus++;
} }
} }
@ -761,7 +767,7 @@ sub find_files {
} }
elsif ( !/SHAmix\.req$/ ) { elsif ( !/SHAmix\.req$/ ) {
print STDERR "WARNING: unrecognized filename $_\n"; print STDERR "WARNING: unrecognized filename $_\n" unless $no_warn_bogus;
$nbogus++; $nbogus++;
} }
} }