summaryrefslogtreecommitdiffstats
path: root/fips
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-10-15 12:30:21 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-10-15 12:30:21 +0000
commitd5b0c872d8e45038f3a05bd94e04008bea76e34d (patch)
treee4d0dd8bc4ce1fe1ce453125b3344af598c658e1 /fips
parent2e8026b65a5edb9d332dfbeca7b9ea2c23f88d27 (diff)
Quote filenames in case they contain spaces. Print out supported values
for --enable and --disable.
Diffstat (limited to 'fips')
-rw-r--r--fips/fipsalgtest.pl15
1 files changed, 12 insertions, 3 deletions
diff --git a/fips/fipsalgtest.pl b/fips/fipsalgtest.pl
index 710dd920f8..851cc98dd9 100644
--- a/fips/fipsalgtest.pl
+++ b/fips/fipsalgtest.pl
@@ -561,7 +561,16 @@ $cmd: generate run CMVP algorithm tests
--quiet Shhh....
--generate Generate algorithm test output
--win32 Win32 environment
+ --enable-<alg> Enable algorithm set <alg>.
+ --disable-<alg> Disable algorithm set <alg>.
+ Where <alg> can be one of:
EOF
+
+while (my ($key, $value) = each %fips_enabled)
+ {
+ printf "\t\t%-20s(%s by default)\n", $key ,
+ $value ? "enabled" : "disabled";
+ }
}
# Sanity check to see if all necessary executables exist
@@ -748,10 +757,10 @@ sub run_tests {
}
my $cmd = "$cmd_prefix$tprefix$tcmd ";
if ( $tcmd =~ /-f$/ ) {
- $cmd .= "$req $out";
+ $cmd .= "\"$req\" \"$out\"";
}
else {
- $cmd .= "<$req >$out";
+ $cmd .= "<\"$req\" >\"$out\"";
}
print STDERR "DEBUG: running test $tname\n" if ( $debug && !$verify );
system($cmd);
@@ -767,7 +776,7 @@ sub run_tests {
$vout =~ s/\.rsp$/.ver/;
$tcmd = $verify_special{$tname};
$cmd = "$cmd_prefix$tprefix$tcmd ";
- $cmd .= "<$out >$vout";
+ $cmd .= "<\"$out\" >\"$vout\"";
system($cmd);
if ( $? != 0 ) {
print STDERR