Update status.

[openssl.git] / Makefile.fips

diff --git a/Makefile.fips b/Makefile.fips
index f5a95a4c8362290d20b0d69313384e3f1184a05d..5bc8e9248375bac340138a4ce3034268be3dee25 100644 (file)
--- a/Makefile.fips
+++ b/Makefile.fips
@@ -140,7 +140,7 @@ FIPSCANLIB=
 
 BASEADDR=
 
-DIRS=   crypto fips test tools
+DIRS=   crypto fips test 
 ENGDIRS= ccgost
 SHLIBDIRS= crypto 
 
@@ -148,10 +148,16 @@ SHLIBDIRS= crypto
 SDIRS=  \
        sha hmac des aes modes \
        bn ec rsa dsa ecdsa dh \
-       buffer rand evp # ecdh cmac
+       buffer rand evp ecdh # cmac
 # keep in mind that the above list is adjusted by ./Configure
 # according to no-xxx arguments...
 
+LINKDIRS=  \
+       objects sha hmac des aes modes \
+       bn ec rsa dsa ecdh ecdsa dh engine \
+       buffer bio stack lhash rand err \
+       evp asn1 ui cmac
+
 # tests to perform.  "alltests" is a special word indicating that all tests
 # should be performed.
 TESTS = alltests
@@ -319,6 +325,8 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/ec/ecp_smpl.o \
        ../crypto/ec/ec2_mult.o \
        ../crypto/ec/ec2_smpl.o \
+       ../crypto/ecdh/ech_key.o \
+       ../crypto/ecdh/ech_ossl.o \
        ../crypto/ecdsa/ecs_ossl.o \
        ../crypto/evp/e_aes.o \
        ../crypto/evp/e_des3.o \
@@ -353,7 +361,7 @@ FIPS_EX_OBJ= ../crypto/aes/aes_cfb.o \
        ../crypto/uid.o
 
 sub_all: build_all
-build_all: build_libs build_tests build_tools
+build_all: build_libs build_tests
 
 build_libs: build_crypto build_fips
 
@@ -494,7 +502,7 @@ libclean:
        rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib
 
 clean: libclean
-       rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
+       rm -f shlib/*.o *.o core a.out fluff testlog make.log cctest cctest.c
        @set -e; target=clean; $(RECURSIVE_BUILD_CMD)
        rm -f $(LIBS)
        rm -f openssl.pc libssl.pc libcrypto.pc
@@ -516,7 +524,8 @@ files:
 links:
        @$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
        @$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
-       @set -e; target=links; $(RECURSIVE_BUILD_CMD)
+       @set -e; dir=fips target=links; $(RECURSIVE_BUILD_CMD)
+       @set -e; dir=crypto target=links; $(RECURSIVE_BUILD_CMD)
 
 gentests:
        @(cd test && echo "generating dummy tests (if needed)..." && \
@@ -526,20 +535,9 @@ dclean:
        rm -rf *.bak include/openssl certs/.0
        @set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
 
-rehash: rehash.time
-rehash.time: certs apps
-       @if [ -z "$(CROSS_COMPILE)" ]; then \
-               (OPENSSL="`pwd`/util/opensslwrap.sh"; \
-               [ -x "apps/openssl.exe" ] && OPENSSL="apps/openssl.exe" || :; \
-               OPENSSL_DEBUG_MEMORY=on; \
-               export OPENSSL OPENSSL_DEBUG_MEMORY; \
-               $(PERL) tools/c_rehash certs) && \
-               touch rehash.time; \
-       else :; fi
-
 test:   tests
 
-tests: rehash
+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
@@ -600,7 +598,7 @@ tar:
        find . -type d -print | xargs chmod 755
        find . -type f -print | xargs chmod a+r
        find . -type f -perm -0100 -print | xargs chmod a+x
-       find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | $(BUILDENV) $(PERL) util/fipsdist.pl | sort > ../$(TARFILE).list; \
+       find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | $(BUILDENV) LINKDIRS='$(LINKDIRS)' $(PERL) util/fipsdist.pl | sort > ../$(TARFILE).list; \
        $(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
        tardy --user_number=0  --user_name=openssl \
              --group_number=0 --group_name=openssl \
@@ -621,7 +619,7 @@ dist:
        $(PERL) Configure dist fipscanisteronly
        @$(MAKE) dist_pem_h
        @$(MAKE) SDIRS='$(SDIRS)' clean
-       @$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar
+       @$(MAKE) -f Makefile.fips TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' tar
 
 dist_pem_h:
        (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)