Commit 982c67fb authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

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

parent 2ef24636
Loading
Loading
Loading
Loading
+1 −0
Changes for crypto/aes/aes_core.c: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@

#include <stdlib.h>
#include <openssl/aes.h>
#include <openssl/fips.h>
#include "aes_locl.h"

/*
+1 −0
Changes for crypto/des/set_key.c: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -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 */
+1 −1
Changes for fips-1.0/aes/Makefile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ LIBOBJ=fips_aes_selftest.o
SRC= $(LIBSRC)

EXHEADER=
HEADER=	$(EXHEADER) fips_aes_locl.h
HEADER=

ALL=    $(GENERAL) $(SRC) $(HEADER)

+1 −1
Changes for fips-1.0/des/Makefile: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ LIBOBJ=fips_des_selftest.o
SRC= $(LIBSRC)

EXHEADER=
HEADER=	$(EXHEADER) fips_des_locl.h
HEADER=

ALL=    $(GENERAL) $(SRC) $(HEADER)

+2 −2
Changes for fips-1.0/sha/Makefile: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -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)

Loading