From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 21 Jul 2007 12:07:09 +0000 (+0000)
Subject: Install fipscanister.o and friends. Disable warning halt in VC++ build.
X-Git-Tag: FIPS_098_TEST_3~47
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=08debe11f879487b7fb3391b3229a845545f8026;p=oweals%2Fopenssl.git

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

diff --git a/fips-1.0/Makefile b/fips-1.0/Makefile
index e9cf38b75f..b5d89875d8 100644
--- 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 cb01bb7480..9145df7ac5 100644
--- 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';