Install fipscanister.o and friends. Disable warning halt in VC++ build.

diff --git a/fips-1.0/Makefile b/fips-1.0/Makefile
index e9cf38b75f3fb1fbe971a6fbda7f7ceb5a09989d..b5d89875d845153574cfaea7973dc3415fec436c 100644 (file)
--- a/fips-1.0/Makefile
+++ b/fips-1.0/Makefile
@@ -168,6 +168,10 @@ install:
        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
        done;
        @target=install; $(RECURSIVE_MAKE)
+       @cp -p -f fipscanister.o fipscanister.o.sha1 fips_premain.c \
+               fips_premain.c.sha1 \
+               $(INSTALL_PREFIX)$(INSTALLTOP)/lib/; \
+       chmod 0444 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/fips*
 
 lint:
        @target=lint; $(RECURSIVE_MAKE)

diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index cb01bb7480a039603a29a13f55e501b24b079364..9145df7ac53f0f9d69d3892374b71c31b37790e3 100644 (file)
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -97,7 +97,7 @@ elsif ($FLAVOR =~ /CE/)
     }
 
     $cc='$(CC)';
-    $base_cflags=' /W3 /WX /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
+    $base_cflags=' /W3 /GF /Gy /nologo -DUNICODE -D_UNICODE -DOPENSSL_SYSNAME_WINCE -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32 -DNO_CHMOD -I$(WCECOMPAT)/include -DOPENSSL_SMALL_FOOTPRINT';
     $base_cflags.=" $wcecdefs";
     $opt_cflags=' /MC /O1i';   # optimize for space, but with intrinsics...
     $dbg_clfags=' /MC /Od -DDEBUG -D_DEBUG';
@@ -105,7 +105,7 @@ elsif ($FLAVOR =~ /CE/)
     }
 else   # Win32
     {
-    $base_cflags=' /W3 /WX /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
+    $base_cflags=' /W3 /Gs0 /GF /Gy /nologo -DOPENSSL_SYSNAME_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -DDSO_WIN32';
     $base_cflags.=' -D_CRT_SECURE_NO_DEPRECATE';       # shut up VC8
     $base_cflags.=' -D_CRT_NONSTDC_NO_DEPRECATE';      # shut up VC8
     $opt_cflags=' /MD /Ox /O2 /Ob2';