summaryrefslogtreecommitdiffstats
path: root/fips/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'fips/Makefile')
-rw-r--r--fips/Makefile15
1 files changed, 3 insertions, 12 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; \