Check reseed interval before generating output.

[openssl.git] / fips / Makefile

diff --git a/fips/Makefile b/fips/Makefile
index 1373fdaf97d4e5d131e6d6698b241961638a7f8d..23191d40c8c62aea9dba501d0bbd2328b03816f9 100644 (file)
--- a/fips/Makefile
+++ b/fips/Makefile
@@ -35,23 +35,23 @@ AFLAGS=$(ASFLAGS)
 
 LIBS=
 
-FDIRS=sha rand des aes dsa ecdh ecdsa 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
 
 LIB= $(TOP)/libcrypto.a
 SHARED_LIB= $(FIPSCANLIB)$(SHLIB_EXT)
-LIBSRC=fips.c 
-LIBOBJ=fips.o
+LIBSRC=fips.c fips_post.c
+LIBOBJ=fips.o fips_post.o
 
 FIPS_OBJ_LISTS=sha/lib hmac/lib rand/lib des/lib aes/lib dsa/lib rsa/lib \
-               dh/lib utl/lib ecdsa/lib
+               dh/lib utl/lib ecdsa/lib cmac/lib
 
 SRC= $(LIBSRC)
 
 EXHEADER=fips.h fipssyms.h
 HEADER=$(EXHEADER) fips_utl.h fips_locl.h
-EXE=fipsld
+EXE=fipsld fips_standalone_sha1
 
 ALL=    $(GENERAL) $(SRC) $(HEADER)
 
@@ -92,11 +92,8 @@ fipscanister.o: fips_start.o $(LIBOBJ) $(FIPS_OBJ_LISTS) fips_end.o
        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 \
-               CPUID="" ; \
-       fi ; \
+       CPUID=""; \
+       list="$(CPUID_OBJ)"; for i in $$list; do CPUID="$$CPUID ../crypto/$$i" ; done; \
        objs="fips_start.o $(LIBOBJ) $(FIPS_EX_OBJ) $$CPUID $$FIPS_ASM"; \
        for i in $(FIPS_OBJ_LISTS); do \
                dir=`dirname $$i`; script="s|^|$$dir/|;s| | $$dir/|g"; \
@@ -104,13 +101,16 @@ fipscanister.o: fips_start.o $(LIBOBJ) $(FIPS_OBJ_LISTS) fips_end.o
        done; \
        objs="$$objs fips_end.o" ; \
        os="`(uname -s) 2>/dev/null`"; cflags="$(CFLAGS)"; \
-       [ "$$os" = "AIX" ] && cflags="$$cflags -Wl,-bnoobjreorder"; \
+       case "$$os" in \
+               AIX)    cflags="$$cflags -Wl,-bnoobjreorder" ;; \
+               HP-UX)  cflags="$$cflags -Wl,+sectionmerge"  ;; \
+       esac; \
        if [ -n "${FIPS_SITE_LD}" ]; then \
                set -x; ${FIPS_SITE_LD} -r -o $@ $$objs; \
        elif $(CC) -dumpversion >/dev/null 2>&1; then \
                set -x; $(CC) $$cflags -r -nostdlib -o $@ $$objs ; \
        else case "$$os" in \
-               HP-UX|OSF1|SunOS) set -x; /usr/ccs/bin/ld -r -o $@ $$objs ;; \
+               OSF1|SunOS) set -x; /usr/ccs/bin/ld -r -o $@ $$objs ;; \
                *) set -x; $(CC) $$cflags -r -o $@ $$objs ;; \
        esac fi
        ./fips_standalone_sha1$(EXE_EXT) fipscanister.o > fipscanister.o.sha1