Updates to WIN32 build system to make FIPS build work again.

6 files changed, 7 insertions, 8 deletions

diff --git a/crypto/aes/aes_core.c b/crypto/aes/aes_core.c
index b6f8a7dd97..f9f7cf9f43 100644
--- a/crypto/aes/aes_core.c
+++ b/crypto/aes/aes_core.c
@@ -37,6 +37,7 @@
 
 #include <stdlib.h>
 #include <openssl/aes.h>
+#include <openssl/fips.h>
 #include "aes_locl.h"
 
 /*
diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index 46bb4cc945..7b9dda657c 100644
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c
@@ -63,6 +63,7 @@
  * 1.1 added norm_expand_bits
  * 1.0 First working version
  */
+#include <openssl/fips.h>
 #include "des_locl.h"
 
 OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key);	/* defaults to false */
diff --git a/fips-1.0/aes/Makefile b/fips-1.0/aes/Makefile
index d92cfea7ac..42782325cd 100644
--- a/fips-1.0/aes/Makefile
+++ b/fips-1.0/aes/Makefile
@@ -32,7 +32,7 @@ LIBOBJ=fips_aes_selftest.o
 SRC= $(LIBSRC)
 
 EXHEADER=
-HEADER=	$(EXHEADER) fips_aes_locl.h
+HEADER=
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
diff --git a/fips-1.0/des/Makefile b/fips-1.0/des/Makefile
index 7a9bda25b4..3adfd7389f 100644
--- a/fips-1.0/des/Makefile
+++ b/fips-1.0/des/Makefile
@@ -31,7 +31,7 @@ LIBOBJ=fips_des_selftest.o
 SRC= $(LIBSRC)
 
 EXHEADER=
-HEADER=	$(EXHEADER) fips_des_locl.h
+HEADER=
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
diff --git a/fips-1.0/sha/Makefile b/fips-1.0/sha/Makefile
index 6bad8e243d..83daa4ebfc 100644
--- a/fips-1.0/sha/Makefile
+++ b/fips-1.0/sha/Makefile
@@ -33,8 +33,8 @@ LIBOBJ=fips_sha1_selftest.o
 
 SRC= $(LIBSRC) fips_standalone_sha1.c
 
-EXHEADER=fips_sha.h
-HEADER=	$(EXHEADER) fips_sha_locl.h fips_md32_common.h
+EXHEADER=
+HEADER=	
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
diff --git a/util/mk1mf.pl b/util/mk1mf.pl
index 9216e11e49..99b6d321f0 100755
--- a/util/mk1mf.pl
+++ b/util/mk1mf.pl
@@ -763,9 +763,6 @@ if ($fips)
 	$rules.=&cc_compile_target("\$(OBJ_D)${o}fips_standalone_sha1$obj",
 		"fips-1.0${o}sha${o}fips_standalone_sha1.c",
 		"\$(SHLIB_CFLAGS)");
-	$rules.=&cc_compile_target("\$(OBJ_D)${o}fips_sha1dgst$obj",
-		"fips-1.0${o}sha${o}fips_sha1dgst.c",
-		"\$(SHLIB_CFLAGS)") unless $fipscanisterbuild;
 	$rules.=&cc_compile_target("\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj",
 		"fips-1.0${o}fips_premain.c",
 		"-DFINGERPRINT_PREMAIN_DSO_LOAD \$(SHLIB_CFLAGS)");
@@ -920,7 +917,7 @@ if ($fips)
 	$rules.= &do_rlink_rule("\$(O_FIPSCANISTER)", "\$(OBJ_D)${o}fips_start$obj", "\$(FIPSOBJ)", "\$(OBJ_D)${o}fips_end$obj", "\$(FIPS_SHA1_EXE)", "") if $fipscanisterbuild;
 	$rules.=&do_link_rule("\$(PREMAIN_DSO_EXE)","\$(OBJ_D)${o}\$(E_PREMAIN_DSO)$obj \$(CRYPTOOBJ) \$(O_FIPSCANISTER)","","\$(EX_LIBS)", 1);
 	
-	$rules.=&do_link_rule("\$(FIPS_SHA1_EXE)","\$(OBJ_D)${o}fips_standalone_sha1$obj \$(OBJ_D)${o}fips_sha1dgst$obj","","", 1);
+	$rules.=&do_link_rule("\$(FIPS_SHA1_EXE)","\$(OBJ_D)${o}fips_standalone_sha1$obj \$(OBJ_D)${o}sha1dgst$obj","","", 1);
 	}
 
 $rules.=&do_link_rule("\$(BIN_D)$o\$(E_EXE)$exep","\$(E_OBJ)","\$(LIBS_DEP)","\$(L_LIBS) \$(EX_LIBS)",0);