From d5b0c872d8e45038f3a05bd94e04008bea76e34d Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Thu, 15 Oct 2009 12:30:21 +0000
Subject: [PATCH] Quote filenames in case they contain spaces. Print out
 supported values for --enable and --disable.

---
 fips/fipsalgtest.pl | 15 ++++++++++++---
 1 file 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
-- 
2.25.1