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

Updates to handle some verification of v2 tests.

Browse Source 
Now enable v2 by default and require a --disable-v2 option to run the
old v1 tests.
This commit is contained in:
Dr. Stephen Henson 2011-10-12 15:33:54 +00:00
parent a854818ea9
commit e15acd9d9e
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
fips/fipsalgtest.pl
View File

@ -473,13 +473,20 @@ my @fips_ecdh_test_list = (
# #
my %verify_special = ( my %verify_special = (
"PQGGen" => "fips_dssvs pqgver", "DSA:PQGGen" => "fips_dssvs pqgver",
"KeyPair" => "fips_dssvs keyver", "DSA:KeyPair" => "fips_dssvs keyver",
"SigGen" => "fips_dssvs sigver", "DSA:SigGen" => "fips_dssvs sigver",
"SigGen15" => "fips_rsavtest", "DSA2:PQGGen" => "fips_dssvs pqgver",
"SigGenRSA" => "fips_rsavtest -x931", "DSA2:KeyPair" => "fips_dssvs keyver",
"SigGenPSS(0)" => "fips_rsavtest -saltlen 0", "DSA2:SigGen" => "fips_dssvs sigver",
"SigGenPSS(62)" => "fips_rsavtest -saltlen 62", "ECDSA:KeyPair" => "fips_ecdsavs PKV",
"ECDSA:SigGen" => "fips_ecdsavs SigVer",
"ECDSA2:KeyPair" => "fips_ecdsavs PKV",
"ECDSA2:SigGen" => "fips_ecdsavs SigVer",
"RSA:SigGen15" => "fips_rsavtest",
"RSA:SigGenRSA" => "fips_rsavtest -x931",
"RSA:SigGenPSS(0)" => "fips_rsavtest -saltlen 0",
"RSA:SigGenPSS(62)" => "fips_rsavtest -saltlen 62",
); );
my $win32 = $^O =~ m/mswin/i; my $win32 = $^O =~ m/mswin/i;
@ -509,7 +516,7 @@ my %fips_enabled = (
"dsa-pqgver" => 2, "dsa-pqgver" => 2,
ecdsa => 2, ecdsa => 2,
rsa => 1, rsa => 1,
"rsa-pss0" => 0, "rsa-pss0" => 2,
"rsa-pss62" => 1, "rsa-pss62" => 1,
sha => 1, sha => 1,
hmac => 1, hmac => 1,
@ -526,7 +533,7 @@ my %fips_enabled = (
"aes-gcm" => 2, "aes-gcm" => 2,
dh => 0, dh => 0,
ecdh => 2, ecdh => 2,
v2 => 0, v2 => 1,
); );
foreach (@ARGV) { foreach (@ARGV) {
@ -956,6 +963,8 @@ END
} }
my $ttype = "";
foreach (@fips_test_list) { foreach (@fips_test_list) {
if ( !ref($_) ) { if ( !ref($_) ) {
if ($outfile ne "") { if ($outfile ne "") {
@ -964,6 +973,7 @@ END
} else { } else {
print "Running $_ tests\n" unless $quiet; print "Running $_ tests\n" unless $quiet;
} }
$ttype = $_;
next; next;
} }
my ( $tname, $tcmd, $regexp, $req, $rsp ) = @$_; my ( $tname, $tcmd, $regexp, $req, $rsp ) = @$_;
@ -1035,10 +1045,10 @@ END
} }
} }
if ($verify) { if ($verify) {
if ( exists $verify_special{$tname} ) { if ( exists $verify_special{"$ttype:$tname"} ) {
my $vout = $rsp; my $vout = $rsp;
$vout =~ s/\.rsp$/.ver/; $vout =~ s/\.rsp$/.ver/;
$tcmd = $verify_special{$tname}; $tcmd = $verify_special{"$ttype:$tname"};
$cmd = "$tprefix$tcmd "; $cmd = "$tprefix$tcmd ";
$cmd .= "\"$out\" \"$vout\""; $cmd .= "\"$out\" \"$vout\"";
system($cmd); system($cmd);