#
my %verify_special = (
- "PQGGen" => "fips_dssvs pqgver",
- "KeyPair" => "fips_dssvs keyver",
- "SigGen" => "fips_dssvs sigver",
- "SigGen15" => "fips_rsavtest",
- "SigGenRSA" => "fips_rsavtest -x931",
- "SigGenPSS(0)" => "fips_rsavtest -saltlen 0",
- "SigGenPSS(62)" => "fips_rsavtest -saltlen 62",
+ "DSA:PQGGen" => "fips_dssvs pqgver",
+ "DSA:KeyPair" => "fips_dssvs keyver",
+ "DSA:SigGen" => "fips_dssvs sigver",
+ "DSA2:PQGGen" => "fips_dssvs pqgver",
+ "DSA2:KeyPair" => "fips_dssvs keyver",
+ "DSA2:SigGen" => "fips_dssvs sigver",
+ "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",
+ "ECDH Ephemeral Primitives Only:KAS_ECC_CDH_PrimitiveTest" => "skip"
);
my $win32 = $^O =~ m/mswin/i;
my $no_warn_bogus = 0;
my $rmcmd = "rm -rf";
my $mkcmd = "mkdir";
+my $cmpall = 0;
my %fips_enabled = (
dsa => 1,
"dsa-pqgver" => 2,
ecdsa => 2,
rsa => 1,
- "rsa-pss0" => 0,
+ "rsa-pss0" => 2,
"rsa-pss62" => 1,
sha => 1,
hmac => 1,
"aes-gcm" => 2,
dh => 0,
ecdh => 2,
- v2 => 0,
+ v2 => 1,
);
foreach (@ARGV) {
} elsif ( $_ eq "--generate" ) {
$verify = 0;
}
+ elsif ( $_ eq "--compare-all" ) {
+ $cmpall = 1;
+ }
elsif ( $_ eq "--notest" ) {
$notest = 1;
}
elsif (/--tprefix=(.*)$/) {
$tprefix = $1;
}
+ elsif (/^--disable-all$/) {
+ foreach (keys %fips_enabled) {
+ $fips_enabled{$_} = 0;
+ }
+ }
elsif (/^--(enable|disable)-(.*)$/) {
if ( !exists $fips_enabled{$2} ) {
print STDERR "Unknown test $2\n";
--ignore-missing Ignore missing test files
--quiet Shhh....
--generate Generate algorithm test output
+ --generate-script=<file> Create shell script of test commands
+ --minimal-script Keep script commands to a minimum
+ --mkdir=<command> Command to make directories in scripts
+ --rm=<command> Command to remove directories in scripts
--win32 Win32 environment
--enable-<alg> Enable algorithm set <alg>.
--disable-<alg> Disable algorithm set <alg>.
my ( $tname, $tref );
my $bad = 0;
my $lastdir = "";
+ $stprefix = $tprefix unless defined $stprefix;
if ($outfile ne "") {
open OUT, ">$outfile" || die "Can't open $outfile";
}
END
} else {
- $stprefix = $tprefix unless defined $stprefix;
print OUT <<END;
#!/bin/sh
}
+ my $ttype = "";
+
foreach (@fips_test_list) {
if ( !ref($_) ) {
if ($outfile ne "") {
} else {
print "Running $_ tests\n" unless $quiet;
}
+ $ttype = $_;
next;
}
my ( $tname, $tcmd, $regexp, $req, $rsp ) = @$_;
my $cmd = "$tcmd \"$req\" \"$out\"";
print STDERR "DEBUG: running test $tname\n" if ( $debug && !$verify );
if ($outfile ne "") {
- print OUT "echo \" running $tname test\"\n" unless $minimal_script;
- print OUT "\${TPREFIX}$cmd\n";
+ if ($minimal_script) {
+ print OUT "$stprefix$cmd\n";
+ } else {
+ print OUT "echo \" running $tname test\"\n" unless $minimal_script;
+ print OUT "\${TPREFIX}$cmd\n";
+ }
} else {
$cmd = "$tprefix$cmd";
system($cmd);
}
}
if ($verify) {
- if ( exists $verify_special{$tname} ) {
+ if ( exists $verify_special{"$ttype:$tname"} && !$cmpall) {
my $vout = $rsp;
$vout =~ s/\.rsp$/.ver/;
- $tcmd = $verify_special{$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 .= "\"$out\" \"$vout\"";
system($cmd);