wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Dr. Stephen Henson 2007-07-11 11:53:20 +00:00
parent 2ef2463643
commit 982c67fbaa
6 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crypto/aes/aes_core.c
View file

@ -37,6 +37,7 @@
#include <stdlib.h>
#include <openssl/aes.h>
#include <openssl/fips.h>
#include "aes_locl.h"
/*

1
crypto/des/set_key.c
View file

@ -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 */

2
fips-1.0/aes/Makefile
View file

@ -32,7 +32,7 @@ LIBOBJ=fips_aes_selftest.o
SRC= $(LIBSRC)
EXHEADER=
HEADER= $(EXHEADER) fips_aes_locl.h
HEADER=
ALL= $(GENERAL) $(SRC) $(HEADER)

2
fips-1.0/des/Makefile
View file

@ -31,7 +31,7 @@ LIBOBJ=fips_des_selftest.o
SRC= $(LIBSRC)
EXHEADER=
HEADER= $(EXHEADER) fips_des_locl.h
HEADER=
ALL= $(GENERAL) $(SRC) $(HEADER)

4
fips-1.0/sha/Makefile
View file

@ -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)

5
util/mk1mf.pl
View file

@ -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);