X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=fips%2Ffipsalgtest.pl;h=30cd9c0ebde6a789ce599d698b5ed6d91942c01c;hb=7b6b246fd393cbe07bc1f0d456140efdff59f971;hp=1382d982b1a3dbe2333de65b2100e80801a702f2;hpb=a846a7ff32096e6e5eb155f819a8a8877a5d70e4;p=oweals%2Fopenssl.git

diff --git a/fips/fipsalgtest.pl b/fips/fipsalgtest.pl
index 1382d982b1..30cd9c0ebd 100644
--- a/fips/fipsalgtest.pl
+++ b/fips/fipsalgtest.pl
@@ -473,13 +473,21 @@ my @fips_ecdh_test_list = (
 #
 
 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;
@@ -502,31 +510,32 @@ my $no_warn_missing = 0;
 my $no_warn_bogus = 0;
 my $rmcmd = "rm -rf";
 my $mkcmd = "mkdir";
+my $cmpall = 0;
 
 my %fips_enabled = (
-    dsa         => 1,
-    dsa2        => 2,
+    "dsa"        => 1,
+    "dsa2"       => 2,
     "dsa-pqgver"  => 2,
-    ecdsa       => 2,
-    rsa         => 1,
-    "rsa-pss0"  => 0,
+    "ecdsa"      => 2,
+    "rsa"        => 1,
+    "rsa-pss0"  => 2,
     "rsa-pss62" => 1,
-    sha         => 1,
-    hmac        => 1,
-    cmac        => 2,
+    "sha"        => 1,
+    "hmac"       => 1,
+    "cmac"       => 2,
     "rand-aes"  => 1,
     "rand-des2" => 0,
-    aes         => 1,
+    "aes"        => 1,
     "aes-cfb1"  => 2,
-    des3        => 1,
+    "des3"       => 1,
     "des3-cfb1" => 2,
-    drbg	=> 2,
+    "drbg"	=> 2,
     "aes-ccm"	=> 2,
     "aes-xts"	=> 2,
     "aes-gcm"	=> 2,
-    dh		=> 0,
-    ecdh	=> 2,
-    v2		=> 0,
+    "dh"	=> 0,
+    "ecdh"	=> 2,
+    "v2"	=> 1,
 );
 
 foreach (@ARGV) {
@@ -562,6 +571,9 @@ foreach (@ARGV) {
     } elsif ( $_ eq "--generate" ) {
         $verify = 0;
     }
+    elsif ( $_ eq "--compare-all" ) {
+        $cmpall = 1;
+    }
     elsif ( $_ eq "--notest" ) {
         $notest = 1;
     }
@@ -734,19 +746,29 @@ sub Help {
     ( my $cmd ) = ( $0 =~ m#([^/]+)$# );
     print <<EOF;
 $cmd: generate run CAVP algorithm tests
-	--debug                     Enable debug output
-	--dir=<dirname>             Optional root for *.req file search
-	--filter=<regexp>
-	--onedir <dirname>          Assume all components in current directory
-	--rspdir=<dirname>          Name of subdirectories containing *.rsp files, default "resp"
-	--tprefix=<prefix>
-	--ignore-bogus              Ignore duplicate or bogus files
-	--ignore-missing            Ignore missing test files
-	--quiet                     Shhh....
-	--generate                  Generate algorithm test output
-	--win32                     Win32 environment
-	--enable-<alg>		    Enable algorithm set <alg>.
-	--disable-<alg>		    Disable algorithm set <alg>.
+	--debug                       Enable debug output
+	--dir=<dirname>               Optional root for *.req file search
+	--filter=<regexp>	      Regex for input files of interest
+	--onedir <dirname>            Assume all components in current directory
+	--rspdir=<dirname>            Name of subdirectories containing *.rsp files, default "resp"
+	--tprefix=<prefix>            Pathname prefix for directory containing test programs
+	--ignore-bogus                Ignore duplicate or bogus files
+	--ignore-missing              Ignore missing test files
+	--quiet                       Shhh....
+	--quiet-bogus                 Skip unrecognized file warnings
+	--quiet-missing               Skip missing request file warnings
+	--generate                    Generate algorithm test output
+	--generate-script=<filename>  Generate script to call algorithm programs
+	--minimal-script              Simplest possible output for --generate-script
+	--win32                       Win32 environment
+	--compare-all                 Verify unconditionally for all tests
+	--list-tests                  Show individual tests
+	--mkdir=<cmd>                 Specify "mkdir" command
+	--notest                      Exit before running tests
+	--rm=<cmd>                    Specify "rm" command
+	--script-tprefix              Pathname prefix for --generate-script output
+	--enable-<alg>		      Enable algorithm set <alg>.
+	--disable-<alg>		      Disable algorithm set <alg>.
 	Where <alg> can be one of:
 EOF
 
@@ -922,6 +944,7 @@ sub run_tests {
     my ( $tname, $tref );
     my $bad = 0;
     my $lastdir = "";
+    $stprefix = $tprefix unless defined $stprefix;
     if ($outfile ne "") {
 	open OUT, ">$outfile" || die "Can't open $outfile";
     }
@@ -937,7 +960,6 @@ echo Running Algorithm Tests
 
 END
 	} else {
-	$stprefix = $tprefix unless defined $stprefix;
 	    print OUT <<END;
 #!/bin/sh
 
@@ -956,6 +978,8 @@ END
 
     }
 
+    my $ttype = "";
+
     foreach (@fips_test_list) {
         if ( !ref($_) ) {
 	    if ($outfile ne "") {
@@ -964,6 +988,7 @@ END
 	    } else {	
             	print "Running $_ tests\n" unless $quiet;
 	    }
+	    $ttype = $_;
             next;
         }
         my ( $tname, $tcmd, $regexp, $req, $rsp ) = @$_;
@@ -1022,8 +1047,12 @@ END
         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);
@@ -1035,10 +1064,15 @@ END
             }
         }
         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);