Fix broken build

[openssl.git] / Makefile.fips

diff --git a/Makefile.fips b/Makefile.fips
index 62a7fee7b9ff5c168f9c66d730b0598589a25c83..b3811dff22f16202466cf6b7d61effc6b7866e10 100644 (file)
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -186,7 +186,7 @@ SHARED_LDFLAGS=
 GENERAL=        Makefile
 BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
-TARFILE=        openssl-fips-test-2.0.tar
+TARFILE=        openssl-fips-2.0-test.tar
 WTARFILE=       $(NAME)-win.tar
 EXHEADER=       e_os2.h
 HEADER=         e_os.h
@@ -275,8 +275,6 @@ BUILD_ONE_CMD=\
 reflect:
        @[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
 
-# FIXME
-
 FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/aes/aes_ecb.o \
        ../crypto/aes/aes_ofb.o \
@@ -331,13 +329,19 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/ecdsa/ecs_ossl.o \
        ../crypto/evp/e_aes.o \
        ../crypto/evp/e_des3.o \
+       ../crypto/evp/e_null.o \
        ../crypto/evp/m_sha1.o \
+       ../crypto/evp/m_dss1.o \
+       ../crypto/evp/m_dss.o \
+       ../crypto/evp/m_ecdsa.o \
        ../crypto/hmac/hmac.o \
        ../crypto/modes/cbc128.o \
+       ../crypto/modes/ccm128.o \
        ../crypto/modes/cfb128.o \
        ../crypto/modes/ctr128.o \
        ../crypto/modes/gcm128.o \
        ../crypto/modes/ofb128.o \
+       ../crypto/modes/xts128.o \
        ../crypto/rsa/rsa_eay.o \
        ../crypto/rsa/rsa_gen.o \
        ../crypto/rsa/rsa_crpt.o \
@@ -355,7 +359,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/uid.o
 
 sub_all: build_all
-build_all: build_libs build_tests
+build_all: build_libs
 
 build_libs: build_crypto build_fips
 
@@ -383,6 +387,8 @@ build_apps:
        @dir=apps; target=all; $(BUILD_ONE_CMD)
 build_tests:
        @dir=test; target=fipsexe; $(BUILD_ONE_CMD)
+build_algvs:
+       @dir=test; target=fipsalgvs; $(BUILD_ONE_CMD)
 build_tools:
        @dir=tools; target=all; $(BUILD_ONE_CMD)
 
@@ -519,7 +525,7 @@ links:
        @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
        @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
        @set -e; dir=fips target=links; $(RECURSIVE_BUILD_CMD)
-       @set -e; dir=crypto target=links; $(RECURSIVE_BUILD_CMD)
+       @(cd crypto ; SDIRS='$(LINKDIRS)' $(MAKE) -e links)
 
 gentests:
        @(cd test && echo "generating dummy tests (if needed)..." && \
@@ -532,9 +538,7 @@ dclean:
 test:   tests
 
 tests:
-       @(cd test && echo "testing..." && \
-       $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests );
-       OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a
+       @echo "Not implemented in FIPS build" ; false
 
 report:
        @$(PERL) util/selftest.pl
@@ -623,28 +627,12 @@ install: all install_sw
 install_sw:
        @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
                $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
-               $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
-               $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
-               $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
-               $(INSTALL_PREFIX)$(OPENSSLDIR)/private
+               $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl
        @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
        do \
        (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
        chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
        done;
        @set -e; target=install; $(RECURSIVE_BUILD_CMD)
-       @set -e; for i in $(LIBS) ;\
-       do \
-               if [ -f "$$i" ]; then \
-               (       echo installing $$i; \
-                       cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
-                       $(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
-                       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
-                       mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
-               fi; \
-       done;
-
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.