From b5cee977c2ae0c0bec73dcdacab4b8a4228a34e4 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Sun, 19 Sep 2010 11:30:14 +0000
Subject: [PATCH] update FIPS script generator to make output easier to hand
 edit

---
 fips/mkfipsscr.pl | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/fips/mkfipsscr.pl b/fips/mkfipsscr.pl
index dc60cdf580..3c30130022 100644
--- a/fips/mkfipsscr.pl
+++ b/fips/mkfipsscr.pl
@@ -297,6 +297,7 @@ my $filter = "";
 my $tvdir;
 my $tprefix;
 my $shwrap_prefix;
+my $shwrap;
 my $debug = 0;
 my $quiet = 0;
 my $rspdir = "rsp";
@@ -331,6 +332,10 @@ foreach (@ARGV)
 		{
 		$rspdir = $1;
 		}
+	elsif (/--noshwrap$/)
+		{
+		$shwrap = "";
+		}
 	elsif (/--rspignore$/)
 		{
 		$rspignore = 1;
@@ -396,6 +401,8 @@ else
 		$shwrap_prefix = "../util/" unless defined $shwrap_prefix;
 		}
 
+	$shwrap = "${shwrap_prefix}shlib_wrap.sh " unless defined $shwrap;
+
 	$bufinit .= <<END;
 #!/bin/sh
 
@@ -403,6 +410,10 @@ else
 # Auto generated by mkfipsscr.pl script
 # Do not edit
 
+RM=rm -rf
+MKDIR=mkdir
+TPREFIX=$tprefix
+
 END
 
 	}
@@ -558,8 +569,8 @@ END
 		$bufout .= <<END;
 
 echo Running tests in "$req"
-rm -rf "$rsp"
-mkdir "$rsp"
+\$RM "$rsp"
+\$MKDIR "$rsp"
 
 END
 		}
@@ -584,7 +595,7 @@ sub test_line
 		else
 			{
 			$bufout .= <<END;
-${shwrap_prefix}shlib_wrap.sh $tprefix$tcmd "$req" "$rsp" || { echo "$req failure" ; exit 1 
+${shwrap}\${TPREFIX}$tcmd "$req" "$rsp" || { echo "$req failure" ; exit 1 
 }
 END
 			$_programs{"${shwrap_prefix}shlib_wrap.sh"} = 1;
@@ -624,7 +635,7 @@ END
 	else
 		{
 		$bufout .= <<END;
-${shwrap_prefix}shlib_wrap.sh $tprefix$tcmd < "$req" > "$rsp" || { echo "$req failure" ; exit 1; }
+${shwrap}\${TPREFIX}$tcmd < "$req" > "$rsp" || { echo "$req failure" ; exit 1; }
 END
 		$_programs{"$tprefix$tcmd"} = 1;
 		}
-- 
2.25.1