From bb67f28a1ea032b8cc338b4a510b2c885d32d876 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Mon, 27 Jun 2005 22:08:58 +0000 Subject: [PATCH] Move fips_test_suite rules from fips/Makefile to test/Makefile. --- fips/Makefile | 15 +++------------ test/Makefile | 13 ++++++++++--- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/fips/Makefile b/fips/Makefile index e05b8f3f23..4396664228 100644 --- a/fips/Makefile +++ b/fips/Makefile @@ -40,6 +40,7 @@ SRC= $(LIBSRC) EXHEADER=fips.h HEADER=$(EXHEADER) fips_err.h EXE=openssl_fips_fingerprint +TEST= fips_test_suite.c ALL= $(GENERAL) $(SRC) $(HEADER) @@ -77,7 +78,8 @@ files: done; links: - @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/include/openssl $(EXHEADER) + @$(PERL) $(TOP)/util/mklink.pl $(TOP)/test $(TEST) @for i in $(FDIRS); do \ (cd $$i && echo "making links in fips/$$i..." && \ $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' FIPS_DES_ENC='${FIPS_DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' FIPS_SHA1_ASM_OBJ='${FIPS_SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PERL='${PERL}' links ); \ @@ -103,17 +105,6 @@ libs: tests: (cd ..; make DIRS=test) -top_fips_test_suite: - (cd $(TOP); $(MAKE) DIRS=fips FDIRS=. TARGET=fips_test_suite sub_target) - -fips_test_suite: fips_test_suite.o $(TOP)/libcrypto.a - @if [ -z "$(SHARED_LIBS)" ]; then \ - set -x; $(CC) $(CFLAGS) -o fips_test_suite fips_test_suite.o $(PEX_LIBS) $(TOP)/libcrypto.a $(EX_LIBS); \ - TOP=$(TOP) $(TOP)/fips/openssl_fips_fingerprint $(TOP)/libcrypto.a fips_test_suite || { rm fips_test_suite; false; }; \ - else \ - set -x; $(CC) $(CFLAGS) -o fips_test_suite fips_test_suite.o $(PEX_LIBS) -L$(TOP) -lcrypto $(EX_LIBS); \ - fi - fips_test: top tests -cd testvectors && perl -p -i -e 's/COUNT=/COUNT = /' des[23]/req/*.req @for i in dsa sha aes des hmac rand rsa; \ diff --git a/test/Makefile b/test/Makefile index 1845468824..919a55c39c 100644 --- a/test/Makefile +++ b/test/Makefile @@ -70,6 +70,7 @@ FIPS_RSASTEST= fips_rsastest FIPS_RSAGTEST= fips_rsagtest FIPS_DSSVS= fips_dssvs FIPS_RNGVS= fips_rngvs +FIPS_TEST_SUITE=fips_test_suite TESTS= alltests @@ -81,7 +82,8 @@ EXE= $(BNTEST)$(EXE_EXT) $(ECTEST)$(EXE_EXT) $(IDEATEST)$(EXE_EXT) $(MD2TEST)$(E $(EVPTEST)$(EXE_EXT) $(FIPS_AESTEST)$(EXE_EXT) \ $(FIPS_HMACTEST)$(EXE_EXT) $(FIPS_RSAVTEST)$(EXE_EXT) \ $(FIPS_RSASTEST)$(EXE_EXT) $(FIPS_RSAGTEST)$(EXE_EXT) \ - $(FIPS_DSSVS)$(EXE_EXT) $(FIPS_RNGVS)$(EXE_EXT) + $(FIPS_DSSVS)$(EXE_EXT) $(FIPS_RNGVS)$(EXE_EXT) \ + $(FIPS_TEST_SUITE)$(EXE_EXT) # $(METHTEST)$(EXE_EXT) @@ -92,7 +94,8 @@ OBJ= $(BNTEST).o $(ECTEST).o $(IDEATEST).o $(MD2TEST).o $(MD4TEST).o $(MD5TEST). $(RANDTEST).o $(FIPS_RANDTEST).o $(DHTEST).o $(ENGINETEST).o $(CASTTEST).o \ $(BFTEST).o $(SSLTEST).o $(DSATEST).o $(FIPS_DSATEST).o $(EXPTEST).o $(RSATEST).o \ $(EVPTEST).o $(FIPS_AESTEST).o $(FIPS_HMACTEST).o $(FIPS_RSAVTEST).o \ - $(FIPS_RSASTEST).o $(FIPS_RSAGTEST).o $(FIPS_DSSVS).o $(FIPS_RNGVS).o + $(FIPS_RSASTEST).o $(FIPS_RSAGTEST).o $(FIPS_DSSVS).o $(FIPS_RNGVS).o \ + $(FIPS_TEST_SUITE).o SRC= $(BNTEST).c $(ECTEST).c $(IDEATEST).c $(MD2TEST).c $(MD4TEST).c $(MD5TEST).c \ $(HMACTEST).c \ $(RC2TEST).c $(RC4TEST).c $(RC5TEST).c \ @@ -100,7 +103,8 @@ SRC= $(BNTEST).c $(ECTEST).c $(IDEATEST).c $(MD2TEST).c $(MD4TEST).c $(MD5TEST) $(RANDTEST).c $(FIPS_RANDTEST).c $(DHTEST).c $(ENGINETEST).c $(CASTTEST).c \ $(BFTEST).c $(SSLTEST).c $(DSATEST).c $(FIPS_DSATEST).c $(EXPTEST).c $(RSATEST).c \ $(EVPTEST).c $(FIPS_AESTEST).c $(FIPS_HMACTEST).c $(FIPS_RSAVTEST).c \ - $(FIPS_RSASTEST).c $(FIPS_RSAGTEST).c $(FIPS_DSSVS).c $(FIPS_RNGVS).c + $(FIPS_RSASTEST).c $(FIPS_RSAGTEST).c $(FIPS_DSSVS).c $(FIPS_RNGVS).c \ + $(FIPS_TEST_SUITE).c EXHEADER= HEADER= $(EXHEADER) @@ -360,6 +364,9 @@ $(FIPS_DSSVS)$(EXE_EXT): $(FIPS_DSSVS).o $(DLIBCRYPTO) $(FIPS_RNGVS)$(EXE_EXT): $(FIPS_RNGVS).o $(DLIBCRYPTO) @target=$(FIPS_RNGVS); $(FIPS_BUILD_CMD) +$(FIPS_TEST_SUITE)$(EXE_EXT): $(FIPS_TEST_SUITE).o $(DLIBCRYPTO) + @target=$(FIPS_TEST_SUITE); $(FIPS_BUILD_CMD) + $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) @target=$(RSATEST); $(BUILD_CMD) -- 2.25.1