Commit 6c9cd652 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Link _chkstk.o from FIPSLIB_D.

parent dd4263d9

util/pl/VC-32.pl

+3 −3
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ sub do_lib_rule 
#		$ret.="\t\$(RM) \$(O_$Name)\n";

		$ret.="$target: $objs\n";

		$ex =' advapi32.lib';

 		$ex.=" ms${o}_chkstk.o" if $fips && $target =~ /O_CRYPTO/;

 		$ex.=" \$(FIPSLIB_d)${o}_chkstk.o" if $fips && $target =~ /O_CRYPTO/;

		$ret.="\t\$(MKLIB) $lfile$target @<<\n  $objs $ex\n<<\n";

		}

	else
@@ -145,7 +145,7 @@ sub do_lib_rule 
 		$ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;

 		if ($fips && $target =~ /O_CRYPTO/)

			{

 			$ex.=" ms${o}_chkstk.o";

 			$ex.=" \$(FIPSLIB_D)ms${o}_chkstk.o";

			$ret.="$target: $objs \$(PREMAIN_DSO_EXE)\n";

			$ret.="\tSET FIPS_LINK=\$(LINK)\n";

			$ret.="\tSET FIPS_CC=\$(CC)\n";
@@ -178,7 +178,7 @@ sub do_link_rule 
	if ($standalone)

		{

		$ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n\t";

		$ret.="ms/_chkstk.o " if ($files =~ /O_FIPSCANISTER/);

		$ret.="\$(FIPSLIB_D)${o}_chkstk.o " if ($files =~ /O_FIPSCANISTER/);

		$ret.="$files $libs\n<<\n";

		}

	elsif ($fips && !$shlib)