update date

[openssl.git] / util / fipsas.pl

diff --git a/util/fipsas.pl b/util/fipsas.pl
index c6964e19cfadd68ea9306b678565771427fc6241..39ce79dd90daed44e6239c7b43f8aac16c16da6c 100644 (file)
--- a/util/fipsas.pl
+++ b/util/fipsas.pl
@@ -9,19 +9,25 @@ my @ARGS = @ARGV;
 my $top = shift @ARGS;
 my $target = shift @ARGS;
 
-# HACK to disable operation if no OPENSSL_FIPSSYMS option.
-# will go away when tested more fully.
+my $runasm = 1;
+
+if ($ARGS[0] eq "norunasm")
+       {
+       $runasm = 0;
+       shift @ARGS;
+       }
 
 my $enabled = 0;
 
-foreach (@ARGS) { $enabled = 1 if /-DOPENSSL_FIPSSYMS/ ; }
+$enabled = 1 if $ENV{CFLAG} =~ /-DOPENSSL_FIPSSYMS/;
 
-if ($enabled == 0)
+if ($enabled == 0 && $runasm)
        {
        system @ARGS;
        exit $?
        }
 
+
 # Open symbol rename file.
 open(IN, "$top/fips/fipssyms.h") || die "Can't open fipssyms.h";
 
@@ -53,18 +59,32 @@ while (<IN>)
 {
        while (($from, $to) = each %edits)
                {
-               s/(\b)$from(\b)/$1$to$2/g;
+               s/(\b_*)$from(\b)/$1$to$2/g;
                }
        print OUT $_;
 }
-# run assembler
-system @ARGS;
 
-my $rv = $?;
+close OUT;
+
+if ($runasm)
+       {
+       # run assembler
+       system @ARGS;
+print STDERR "RUNNING: @ARGS\n";
+       my $rv = $?;
+exit 0;
+       # restore target
+       unlink $target;
+       rename "tmptarg.s", $target;
+
+       die "Error executing assembler!" if $rv != 0;
+       }
+else
+       {
+       # Don't care about target
+       unlink "tmptarg.s";
+       }
+
 
-# restore target
-unlink $target;
-rename "tmptarg.s", $target;
 
-die "Error executing assembler!" if $rv != 0;