Update to VC++ static build.

diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 2889782bef0c454fd93763dcbfe0e9e8c74a43f6..dab6664d93942ca6c94aa334c50395fb23fe47c7 100755 (executable)
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -16,6 +16,9 @@ local $zlib_lib = "";
 my $fips_canister_path = "";
 my $fipslibdir = "fipslib";
 
+my $ex_l_libs = "";
+
+
 open(IN,"<Makefile") || die "unable to open Makefile!\n";
 while(<IN>) {
     $ssl_version=$1 if (/^VERSION=(.*)$/);
@@ -117,6 +120,7 @@ $mkcanister="ld -r -o";
 $ex_build_targets = "";
 
 ($ssl,$crypto)=("ssl","crypto");
+$cryptocompat = "";
 $ranlib="echo ranlib";
 
 $cc=(defined($VARS{'CC'}))?$VARS{'CC'}:'cc';
@@ -363,6 +367,12 @@ if ($fips_canister_path eq "")
 
        $ex_build_targets .= "\$(FIPSLIB_D)${o}\$(E_PREMAIN_DSO)$exep" if ($fips_canister_build);
 
+if ($fips && !$shlib)
+       {
+       $ex_build_targets .= " \$(LIB_D)$o$crypto_compat";
+       $ex_l_libs .= " \$(O_FIPSCANISTER)";
+       }
+
 $defs= <<"EOF";
 # This makefile has been automatically generated from the OpenSSL distribution.
 # This single makefile will build the complete OpenSSL distribution and
@@ -488,7 +498,7 @@ SO_CRYPTO= $plib\$(CRYPTO)$so_shlibp
 L_SSL=     \$(LIB_D)$o$plib\$(SSL)$libp
 L_CRYPTO=  \$(LIB_D)$o$plib\$(CRYPTO)$libp
 
-L_LIBS= \$(L_SSL) \$(L_CRYPTO)
+L_LIBS= \$(L_SSL) \$(L_CRYPTO) $ex_l_libs
 
 ######################################################
 # Don't touch anything below this point
@@ -498,7 +508,7 @@ INC=-I\$(INC_D) -I\$(INCL_D)
 APP_CFLAGS=\$(INC) \$(CFLAG) \$(APP_CFLAG)
 LIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG)
 SHLIB_CFLAGS=\$(INC) \$(CFLAG) \$(LIB_CFLAG) \$(SHLIB_CFLAG)
-LIBS_DEP=\$(O_CRYPTO) \$(O_SSL)
+LIBS_DEP=\$(O_CRYPTO) \$(O_SSL) $ex_libs_dep
 
 #############################################
 EOF
@@ -721,9 +731,10 @@ if ($fips)
                }
        else
                {
-               $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
-#              $rules.= &do_lib_rule("\$(CRYPTOOBJ)",
+               $rules.= &do_lib_rule("\$(CRYPTOOBJ)",
                        "\$(O_CRYPTO)",$crypto,$shlib,"\$(SO_CRYPTO)", "");
+               $rules.= &do_lib_rule("\$(CRYPTOOBJ) \$(O_FIPSCANISTER)",
+                       "\$(LIB_D)$o$crypto_compat",$crypto,$shlib,"\$(SO_CRYPTO)", "");
                }
        }
        else
@@ -736,7 +747,7 @@ if ($fips)
 if ($fips && $fips_canister_build)
        {
        $rules.= &do_rlink_rule("\$(O_FIPSCANISTER)", "\$(OBJ_D)${o}fips_start$obj \$(FIPSOBJ) \$(OBJ_D)${o}fips_end$obj", "\$(FIPSLIB_D)${o}fips_standalone_sha1$exep", "") if $fips_canister_build;
-       $rules.=&do_link_rule("\$(FIPSLIB_D)${o}\$(E_PREMAIN_DSO)$exep","\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj \$(O_CRYPTO)","","\$(EX_LIBS)", 1);
+       $rules.=&do_link_rule("\$(FIPSLIB_D)${o}\$(E_PREMAIN_DSO)$exep","\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj \$(O_CRYPTO) \$(O_FIPSCANISTER)","","\$(EX_LIBS)", 1);
        }
        
        $rules.=&do_link_rule("\$(FIPSLIB_D)${o}fips_standalone_sha1$exep","\$(OBJ_D)${o}fips_standalone_sha1$obj \$(OBJ_D)${o}fips_sha1dgst$obj","","", 1);

diff --git a/util/pl/VC-32-GMAKE.pl b/util/pl/VC-32-GMAKE.pl
index be4a11db9d8a3f9fa525c3ff26409be218b8c1fd..e6bed7674728cf80dcc9f5d9eebeb19b46fcbb2b 100644 (file)
--- a/util/pl/VC-32-GMAKE.pl
+++ b/util/pl/VC-32-GMAKE.pl
@@ -2,8 +2,17 @@
 # VCw32lib.pl - the file for Visual C++ 4.[01] for windows NT, static libraries
 #
 
+
+if ($fips && !$shlib)
+       {
+       $crypto="libeayfips32";
+       $crypto_compat = "libeaycompat32.lib";
+       }
+else
+       {
+       $crypto="libeay32";
+       }
 $ssl=  "ssleay32";
-$crypto="libeay32";
 
 $o='/';
 #$cp='copy nul+';      # Timestamps get stuffed otherwise

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index 6c7e4bcbee32191731bbbd98408581a6c81a0ecf..0f9778de7555af351a40d05498661cae19afc2cc 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -3,7 +3,16 @@
 #
 
 $ssl=  "ssleay32";
-$crypto="libeay32";
+
+if ($fips && !$shlib)
+       {
+       $crypto="libeayfips32";
+       $crypto_compat = "libeaycompat32.lib";
+       }
+else
+       {
+       $crypto="libeay32";
+       }
 
 $o='\\';
 $cp='copy nul+';       # Timestamps get stuffed otherwise