Implement health checks needed by SP800-90.

[openssl.git] / fips / fipsalgtest.pl

diff --git a/fips/fipsalgtest.pl b/fips/fipsalgtest.pl
index 851cc98dd9f16076ea3bc08dd06bda11a2ef0492..af778a47a933b3215d3eea3df6dcb56d062d919f 100644 (file)
--- a/fips/fipsalgtest.pl
+++ b/fips/fipsalgtest.pl
@@ -760,7 +760,7 @@ sub run_tests {
             $cmd .= "\"$req\" \"$out\"";
         }
         else {
-            $cmd .= "<\"$req\" >\"$out\"";
+            $cmd .= "\"$req\" \"$out\"";
         }
         print STDERR "DEBUG: running test $tname\n" if ( $debug && !$verify );
         system($cmd);
@@ -776,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
@@ -881,7 +881,10 @@ sub next_line {
         s/\s+/ /g;
        # Delete trailing whitespace
        s/\s+$//;
-        return $_;
+       # Remove leading zeroes
+       s/= 00/= /;
+       # Translate to upper case
+        return uc $_;
     }
     return undef;
 }