generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update FIPS script generator to make output easier to hand edit

Browse Source
This commit is contained in:
Dr. Stephen Henson
2010-09-19 11:30:14 +00:00
parent ae3b60ba99
commit b5cee977c2
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fips/mkfipsscr.pl
View File

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