Add mem_clr.c explicity for no-asm builds.

[openssl.git] / fips / Makefile

diff --git a/fips/Makefile b/fips/Makefile
index 1eafa5548185df600214b3b4e1be448f45d4e165..28df80cab8a50a314bc7533b992172ffe75b7cd0 100644 (file)
--- a/fips/Makefile
+++ b/fips/Makefile
@@ -35,7 +35,7 @@ AFLAGS=$(ASFLAGS)
 
 LIBS=
 
-FDIRS=sha rand des aes dsa rsa dh hmac utl
+FDIRS=sha rand des aes dsa ecdh ecdsa rsa dh cmac hmac utl
 
 GENERAL=Makefile README fips-lib.com install.com
 
@@ -45,11 +45,11 @@ LIBSRC=fips.c
 LIBOBJ=fips.o
 
 FIPS_OBJ_LISTS=sha/lib hmac/lib rand/lib des/lib aes/lib dsa/lib rsa/lib \
-               dh/lib utl/lib
+               dh/lib utl/lib ecdsa/lib cmac/lib
 
 SRC= $(LIBSRC)
 
-EXHEADER=fips.h
+EXHEADER=fips.h fipssyms.h
 HEADER=$(EXHEADER) fips_utl.h fips_locl.h
 EXE=fipsld
 
@@ -62,7 +62,9 @@ testapps:
        @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi
 
 all:
-       @if [ -z "$(FIPSLIBDIR)" ]; then \
+       @if [ -n "$(FIPSCANISTERONLY)" ]; then \
+               $(MAKE) -e subdirs lib ; \
+       elif [ -z "$(FIPSLIBDIR)" ]; then \
                $(MAKE) -e subdirs lib fips_premain_dso$(EXE_EXT); \
        else  \
                $(MAKE) -e lib fips_premain_dso$(EXE_EXT) fips_standalone_sha1$(EXE_EXT); \
@@ -89,6 +91,7 @@ fipscanister.o: fips_start.o $(LIBOBJ) $(FIPS_OBJ_LISTS) fips_end.o
        list="$(AES_ENC)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/aes/$$i" ; done; \
        list="$(DES_ENC)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/des/$$i" ; done; \
        list="$(SHA1_ASM_OBJ)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/sha/$$i" ; done; \
+       list="$(MODES_ASM_OBJ)"; for i in $$list; do FIPS_ASM="$$FIPS_ASM ../crypto/modes/$$i" ; done; \
        if [ -n "$(CPUID_OBJ)" ]; then \
                CPUID=../crypto/$(CPUID_OBJ) ; \
        else \
@@ -106,7 +109,6 @@ fipscanister.o: fips_start.o $(LIBOBJ) $(FIPS_OBJ_LISTS) fips_end.o
                set -x; ${FIPS_SITE_LD} -r -o $@ $$objs; \
        elif $(CC) -dumpversion >/dev/null 2>&1; then \
                set -x; $(CC) $$cflags -r -nostdlib -o $@ $$objs ; \
-               echo OBJS $$objs >/tmp/objs.txt ; \
        else case "$$os" in \
                HP-UX|OSF1|SunOS) set -x; /usr/ccs/bin/ld -r -o $@ $$objs ;; \
                *) set -x; $(CC) $$cflags -r -o $@ $$objs ;; \
@@ -219,14 +221,15 @@ dclean:
 
 fips.o: ../include/openssl/asn1.h ../include/openssl/bio.h
 fips.o: ../include/openssl/crypto.h ../include/openssl/des.h
-fips.o: ../include/openssl/des_old.h ../include/openssl/e_os2.h
-fips.o: ../include/openssl/err.h ../include/openssl/evp.h
-fips.o: ../include/openssl/fips.h ../include/openssl/fips_rand.h
-fips.o: ../include/openssl/hmac.h ../include/openssl/lhash.h
-fips.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
-fips.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-fips.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
-fips.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
-fips.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
-fips.o: ../include/openssl/ui.h ../include/openssl/ui_compat.h fips.c
-fips.o: fips_locl.h
+fips.o: ../include/openssl/des_old.h ../include/openssl/dsa.h
+fips.o: ../include/openssl/e_os2.h ../include/openssl/ec.h
+fips.o: ../include/openssl/ecdsa.h ../include/openssl/err.h
+fips.o: ../include/openssl/evp.h ../include/openssl/fips.h
+fips.o: ../include/openssl/fips_rand.h ../include/openssl/hmac.h
+fips.o: ../include/openssl/lhash.h ../include/openssl/obj_mac.h
+fips.o: ../include/openssl/objects.h ../include/openssl/opensslconf.h
+fips.o: ../include/openssl/opensslv.h ../include/openssl/ossl_typ.h
+fips.o: ../include/openssl/rand.h ../include/openssl/rsa.h
+fips.o: ../include/openssl/safestack.h ../include/openssl/stack.h
+fips.o: ../include/openssl/symhacks.h ../include/openssl/ui.h
+fips.o: ../include/openssl/ui_compat.h fips.c fips_locl.h