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

Skip ECDH sanity check. Add --compare-all to run comparison tests on

Browse Source 
all files instead of sanity checks.
This commit is contained in:
Dr. Stephen Henson 2011-10-12 17:18:38 +00:00
parent a2b6dc97f6
commit 98bc806749
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fips/fipsalgtest.pl
View File

@ -487,6 +487,7 @@ my %verify_special = (
"RSA:SigGenRSA" => "fips_rsavtest -x931", "RSA:SigGenRSA" => "fips_rsavtest -x931",
"RSA:SigGenPSS(0)" => "fips_rsavtest -saltlen 0", "RSA:SigGenPSS(0)" => "fips_rsavtest -saltlen 0",
"RSA:SigGenPSS(62)" => "fips_rsavtest -saltlen 62", "RSA:SigGenPSS(62)" => "fips_rsavtest -saltlen 62",
"ECDH Ephemeral Primitives Only:KAS_ECC_CDH_PrimitiveTest" => "skip"
); );
my $win32 = $^O =~ m/mswin/i; my $win32 = $^O =~ m/mswin/i;
@ -509,6 +510,7 @@ my $no_warn_missing = 0;
my $no_warn_bogus = 0; my $no_warn_bogus = 0;
my $rmcmd = "rm -rf"; my $rmcmd = "rm -rf";
my $mkcmd = "mkdir"; my $mkcmd = "mkdir";
my $cmpall = 0;
my %fips_enabled = ( my %fips_enabled = (
dsa => 1, dsa => 1,
@ -569,6 +571,9 @@ foreach (@ARGV) {
} elsif ( $_ eq "--generate" ) { } elsif ( $_ eq "--generate" ) {
$verify = 0; $verify = 0;
} }
elsif ( $_ eq "--compare-all" ) {
$cmpall = 1;
}
elsif ( $_ eq "--notest" ) { elsif ( $_ eq "--notest" ) {
$notest = 1; $notest = 1;
} }
@ -1045,10 +1050,15 @@ END
} }
} }
if ($verify) { if ($verify) {
if ( exists $verify_special{"$ttype:$tname"} ) { if ( exists $verify_special{"$ttype:$tname"} && !$cmpall) {
my $vout = $rsp; my $vout = $rsp;
$vout =~ s/\.rsp$/.ver/; $vout =~ s/\.rsp$/.ver/;
$tcmd = $verify_special{"$ttype:$tname"}; $tcmd = $verify_special{"$ttype:$tname"};
if ($tcmd eq "skip") {
print STDERR "DEBUG: No verify possible: skipped.\n" if $debug;
$scheckok++;
next;
}
$cmd = "$tprefix$tcmd "; $cmd = "$tprefix$tcmd ";
$cmd .= "\"$out\" \"$vout\""; $cmd .= "\"$out\" \"$vout\"";
system($cmd); system($cmd);