Use perl script instead of editbin to rename object file sections.

diff --git a/CHANGES b/CHANGES
index 1b5fdc076522dc4f9712e06017a2747edca6db54..7b55b2c2c637a28852878e759f2deff8648d8780 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,12 +6,13 @@
 
   *) Modify VC++ build system to rename .text and .rdata segments in
      FIPS sources to .fipst${a,b,c}, and $fipsr${a,b,c} and place them
-     in a static library fipscanister.lib. These are then combined by the
-     VC++ linker into a single segment in suffix order but without the
-     suffix (i.e. .fipst and .fipsr). This serves the same purpose as
-     fipscanister.o on other platforms but has the advantage that it can
-     be created using only standard VC++ utilities.
-     [Steve Henson]
+     in a static library fipscanister.lib using a perl script. These are
+     then combined by the VC++ linker into a single segment in suffix
+     order but without the suffix (i.e. .fipstx, .fipsrd and .fipsda).
+     This serves the same purpose as fipscanister.o on other platforms
+     but has the advantage that it can be created using only standard VC++
+     utilities.
+     [Steve Henson and Andy Polyakov]
 
   *) Modify WIN32 build system to forward references functions implemented
      in FIPS DLL. 

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index e6257ea149f683cf067e723b18d2847ed53223d7..99022058392e6a3f8125175ca8300d4ab2c304aa 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -403,12 +403,10 @@ sub do_rlink_rule
        $file =~ s/\//$o/g if $o ne '/';
        $n=&bname($targer);
        $ret.="$target: $files $dep_libs \$(FIPS_SHA1_EXE)\n";
-       $ret.="\teditbin /SECTION:.text=.fipst\$\$a /SECTION:.rdata=.fipsr\$\$a $rl_start\n";
-       $ret.="\teditbin /SECTION:.text=.fipst\$\$b /SECTION:.rdata=.fipsr\$\$b @<<\n\t$rl_mid\n<<\n";
-       $ret.="\teditbin /SECTION:.text=.fipst\$\$c /SECTION:.rdata=.fipsr\$\$c $rl_end\n";
+       $ret.="\t\$(PERL) ms\\segrenam.pl \$\$a $rl_start\n";
+       $ret.="\t\$(PERL) ms\\segrenam.pl \$\$b $rl_mid\n";
+       $ret.="\t\$(PERL) ms\\segrenam.pl \$\$c $rl_end\n";
        $ret.="\t\$(MKLIB) $lfile$target @<<\n\t$files\n<<\n";
-       #$ret.="\t\$(MKCANISTER) $target <<\n";
-       #$ret.="INPUT($files)\n<<\n";
        $ret.="\t\$(FIPS_SHA1_EXE) $target > ${target}.sha1\n";
        $ret.="\t\$(PERL) util${o}copy.pl -stripcr fips-1.0${o}fips_premain.c \$(LIB_D)${o}fips_premain.c\n";
        $ret.="\t\$(CP) fips-1.0${o}fips_premain.c.sha1 \$(LIB_D)${o}fips_premain.c.sha1\n";