[openssl-commits] [openssl] OpenSSL_1_0_1-stable update

[Dr. Stephen Henson]

The branch OpenSSL_1_0_1-stable has been updated
       via  978c8aa8b79692d193437d28e2485ec5ffa9d6cc (commit)
      from  72ac982306be9c9ad5f355dba725ab3d0716879e (commit)


- Log -----------------------------------------------------------------
commit 978c8aa8b79692d193437d28e2485ec5ffa9d6cc
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Mon Sep 28 14:14:10 2015 +0100

    Link in applink with fips_premain_dso
    
    PR#4042
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (cherry picked from commit d62c64b947ae96463a331de005165c57966d2149)

-----------------------------------------------------------------------

Summary of changes:
 util/pl/VC-32.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index b597998..e5abb97 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -342,15 +342,17 @@ sub do_link_rule
 	local($ret,$_);
 	$file =~ s/\//$o/g if $o ne '/';
 	$n=&bname($target);
-	$ret.="$target: $files $dep_libs\n";
+	$ret.="$target: $files $dep_libs";
 	if ($standalone == 1)
 		{
+		$ret.=" \$(OBJ_D)${o}applink.obj\n";
 		$ret.="  \$(LINK) \$(LFLAGS) $efile$target @<<\n\t";
-		$ret.= "\$(EX_LIBS) " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild);
+		$ret.= "\$(EX_LIBS) \$(OBJ_D)${o}applink.obj " if ($files =~ /O_FIPSCANISTER/ && !$fipscanisterbuild);
 		$ret.="$files $libs\n<<\n";
 		}
 	elsif ($standalone == 2)
 		{
+		$ret.="\n";
 		$ret.="\tSET FIPS_LINK=\$(LINK)\n";
 		$ret.="\tSET FIPS_CC=\$(CC)\n";
 		$ret.="\tSET FIPS_CC_ARGS=/Fo\$(OBJ_D)${o}fips_premain.obj \$(SHLIB_CFLAGS) -c\n";
@@ -363,6 +365,7 @@ sub do_link_rule
 		}
 	else
 		{
+		$ret.="\n";
 		$ret.="\t\$(LINK) \$(LFLAGS) $efile$target @<<\n";
 		$ret.="\t\$(APP_EX_OBJ) $files $libs\n<<\n";
 		}