X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=fips%2FMakefile;h=fb5083810a1b4fc1104aff4e15131d1f319ece0d;hp=84b32cacb00552eb4437bdca3eaa475d83788584;hb=0ebc965b9ca4352e407bb7cfa65ac235942117f6;hpb=fe26d066ff6d34a01a2d05cba383e099960182c0

diff --git a/fips/Makefile b/fips/Makefile
index 84b32cacb0..fb5083810a 100644
--- a/fips/Makefile
+++ b/fips/Makefile
@@ -35,23 +35,23 @@ AFLAGS=$(ASFLAGS)
 
 LIBS=
 
-FDIRS=sha rand des aes dsa 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 ecdh/lib cmac/lib
 
 SRC= $(LIBSRC)
 
-EXHEADER=fips.h fipshacks.h
-HEADER=$(EXHEADER) fips_utl.h fips_locl.h
-EXE=fipsld
+EXHEADER=fips.h fipssyms.h
+HEADER=$(EXHEADER) fips_utl.h fips_locl.h fips_auth.h
+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,14 +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 ; \
-		echo OBJS $$objs >/tmp/objs.txt ; \
 	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
@@ -220,9 +219,10 @@ dclean:
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-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/aes.h ../include/openssl/asn1.h
+fips.o: ../include/openssl/bio.h ../include/openssl/crypto.h
+fips.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+fips.o: ../include/openssl/ec.h ../include/openssl/ecdsa.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
@@ -230,6 +230,18 @@ 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: ../include/openssl/stack.h ../include/openssl/symhacks.h fips.c
 fips.o: fips_locl.h
+fips_post.o: ../include/openssl/aes.h ../include/openssl/asn1.h
+fips_post.o: ../include/openssl/bio.h ../include/openssl/crypto.h
+fips_post.o: ../include/openssl/dsa.h ../include/openssl/e_os2.h
+fips_post.o: ../include/openssl/ec.h ../include/openssl/ecdsa.h
+fips_post.o: ../include/openssl/err.h ../include/openssl/evp.h
+fips_post.o: ../include/openssl/fips.h ../include/openssl/fips_rand.h
+fips_post.o: ../include/openssl/hmac.h ../include/openssl/lhash.h
+fips_post.o: ../include/openssl/obj_mac.h ../include/openssl/objects.h
+fips_post.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
+fips_post.o: ../include/openssl/ossl_typ.h ../include/openssl/rand.h
+fips_post.o: ../include/openssl/rsa.h ../include/openssl/safestack.h
+fips_post.o: ../include/openssl/stack.h ../include/openssl/symhacks.h
+fips_post.o: fips_locl.h fips_post.c