common cleanup (WIP)OS-7881

7 files changed, 179 insertions, 306 deletions

diff --git a/usr/src/test/crypto-tests/tests/Makefile b/usr/src/test/crypto-tests/tests/Makefile
index 16eab78dd5..0c35c9f7cf 100644
--- a/usr/src/test/crypto-tests/tests/Makefile
+++ b/usr/src/test/crypto-tests/tests/Makefile
@@ -16,6 +16,8 @@
 
 SUBDIRS = modes common digest hmac
 
+all: $(SUBDIRS)
+
 modes: common
 digest: common
 hmac: common
diff --git a/usr/src/test/crypto-tests/tests/Makefile.crypto b/usr/src/test/crypto-tests/tests/Makefile.crypto
new file mode 100644
index 0000000000..8d7396fa64
--- /dev/null
+++ b/usr/src/test/crypto-tests/tests/Makefile.crypto
@@ -0,0 +1,112 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright (c) 2012 by Delphix. All rights reserved.
+# Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
+# Copyright 2019 Joyent, Inc.
+#
+
+include $(SRC)/cmd/Makefile.cmd
+include $(SRC)/test/Makefile.com
+include $(SRC)/cmd/Makefile.ctf
+
+PROGS_32 = $(CRYPTO:%=$(BASEPROG)_32_%)
+PROGS_64 = $(CRYPTO:%=$(BASEPROG)_64_%)
+PROGS = $(PROGS_32) $(PROGS_64)
+
+COMMON_OBJS_32 = $(COMMON_OBJS:%.o=%.32.o)
+COMMON_OBJS_64 = $(COMMON_OBJS:%.o=%.64.o)
+
+# Some tests may only be relevant for PKCS#11 or KCF.  One can use
+# a statement like 'CRYPTO_kcf = $(POUND_SIGN)' in a test's Makefile to
+# disable creation of tests for a given framework.  For an example, see
+# modes/aes/cbc_pad/Makefile
+$(CRYPTO_pkcs)PROGS_pkcs = $(BASEPROG:%=%_32_pkcs) $(BASEPROG:%=%_64_pkcs)
+$(CRYPTO_kcf)PROGS_kcf = $(BASEPROG:%=%_32_kcf) $(BASEPROG:%=%_64_kcf)
+
+# $(TESTROOT) must be set by whatever includes this file
+$(CRYPTO_pkcs)TESTDIR_pkcs = $(TESTROOT)/pkcs
+$(CRYPTO_kcf)TESTDIR_kcf = $(TESTROOT)/kcf
+
+COMMONDIR = $(SRC)/test/crypto-tests/tests/common
+$(PROGS_32) := OBJS += $(BASEPROG:%=%.32.o) $(COMMON_OBJS_32)
+$(PROGS_64) := OBJS += $(BASEPROG:%=%.64.o) $(COMMON_OBJS_64)
+$(PROGS_32) := OBJS += $(COMMONDIR)/testfuncs.32.o
+$(PROGS_64) := OBJS += $(COMMONDIR)/testfuncs.64.o
+$(CRYPTO_pkcs)$(BASEPROG)_32_pkcs := OBJS += $(COMMONDIR)/cryptotest_pkcs.32.o
+$(CRYPTO_pkcs)$(BASEPROG)_64_pkcs := OBJS += $(COMMONDIR)/cryptotest_pkcs.64.o
+$(CRYPTO_kcf)$(BASEPROG)_32_kcf	:= OBJS += $(COMMONDIR)/cryptotest_kcf.32.o
+$(CRYPTO_kcf)$(BASEPROG)_64_kcf	:= OBJS += $(COMMONDIR)/cryptotest_kcf.64.o
+
+$(CRYPTO_pkcs)$(PROGS_pkcs)	:= LDLIBS += -lpkcs11 -lcryptoutil
+
+CSTD = $(CSTD_GNU99)
+
+$(CRYPTO_pkcs)CMDS_pkcs = $(PROGS_pkcs:%_pkcs=$(TESTDIR_pkcs)/%)
+$(CRYPTO_kcf)CMDS_kcf = $(PROGS_kcf:%_kcf=$(TESTDIR_kcf)/%)
+CMDS = $(CMDS_pkcs) $(CMDS_kcf)
+
+$(CMDS) := FILEMODE = 0555
+
+CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+CPPFLAGS += -I$(COMMONDIR) -I$(SRC)/common/crypto/
+
+all: $(PROGS)
+
+%_32_pkcs: %.32.o $(COMMON_OBJS_32)
+	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
+	$(POST_PROCESS)
+
+%_64_pkcs: %.64.o $(COMMON_OBJS_64)
+	$(LINK64.c) $(OBJS) -o $@ $(LDLIBS)
+	$(POST_PROCESS)
+
+%_32_kcf: %.32.o $(COMMON_OBJS_32)
+	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
+	$(POST_PROCESS)
+
+%_64_kcf: %.64.o $(COMMON_OBJS_64)
+	$(LINK64.c) $(OBJS) -o $@ $(LDLIBS)
+	$(POST_PROCESS)
+
+%.32.o: %.c
+	$(COMPILE.c) -o $@ $<
+	$(POST_PROCESS_O)
+
+%.64.o: %.c
+	$(COMPILE64.c) -o $@ $<
+	$(POST_PROCESS_O)
+
+install: all $(CMDS)
+
+clobber: clean
+	-$(RM) $(PROGS)
+
+clean:
+	-$(RM) *.o $(COMMON_OBJS_32) $(COMMON_OBJS_64)
+
+$(CMDS): $(TESTDIR_pkcs) $(TESTDIR_kcf) $(PROGS)
+
+$(TESTDIR_pkcs) $(TESTDIR_kcf):
+	$(INS.dir)
+
+$(TESTDIR_pkcs)/%_32: %_32_pkcs
+	$(INS.rename)
+
+$(TESTDIR_pkcs)/%_64: %_64_pkcs
+	$(INS.rename)
+
+$(TESTDIR_kcf)/%_32: %_32_kcf
+	$(INS.rename)
+
+$(TESTDIR_kcf)/%_64: %_64_kcf
+	$(INS.rename)
diff --git a/usr/src/test/crypto-tests/tests/digest/Makefile b/usr/src/test/crypto-tests/tests/digest/Makefile
index f4e1acc80b..a5732aa375 100644
--- a/usr/src/test/crypto-tests/tests/digest/Makefile
+++ b/usr/src/test/crypto-tests/tests/digest/Makefile
@@ -10,132 +10,21 @@
 #
 
 #
-# Copyright 2018, Joyent, Inc.
+# Copyright 2019 Joyent, Inc.
 #
 
-include $(SRC)/cmd/Makefile.cmd
-include $(SRC)/test/Makefile.com
-include $(SRC)/cmd/Makefile.ctf
+ALGS	= sha1 sha256 sha384 sha512 sha512_224 sha512_256 md5
 
-ALGS = sha1 sha256 sha384 sha512 sha512_224 sha512_256 md5
-CRYPTO = pkcs kcf
+all	:=	TARGET = all
+install	:=	TARGET = install
+clean	:=	TARGET = clean
+clobber	:=	TARGET = clobber
 
-PROGS_pkcs_32 = $(ALGS:%=%_32_pkcs)
-PROGS_pkcs_64 = $(ALGS:%=%_64_pkcs)
-PROGS_kcf_32 = $(ALGS:%=%_32_kcf)
-PROGS_kcf_64 = $(ALGS:%=%_64_kcf)
-PROGS_pkcs = $(PROGS_pkcs_32) $(PROGS_pkcs_64)
-PROGS_kcf = $(PROGS_kcf_32) $(PROGS_kcf_64)
-PROGS_32 = $(PROGS_pkcs_32) $(PROGS_kcf_32)
-PROGS_64 = $(PROGS_pkcs_64) $(PROGS_kcf_64)
-PROGS = $(PROGS_32) $(PROGS_64)
+.KEEP_STATE:
 
-ROOTOPTPKG = $(ROOT)/opt/crypto-tests
-TESTROOT = $(ROOTOPTPKG)/tests/digest
-TESTDIR_pkcs = $(TESTROOT)/pkcs
-TESTDIR_kcf = $(TESTROOT)/kcf
+all clean clobber install: $(ALGS)
 
-COMMONDIR = ../common
+$(ALGS): FRC
+	$(MAKE) -e -f Makefile.digest BASEPROG=$@ $(TARGET)
 
-$(CRYPTO:%=sha1_32_%)	:= OBJS = sha1.32.o
-$(CRYPTO:%=sha256_32_%)	:= OBJS = sha256.32.o
-$(CRYPTO:%=sha384_32_%)	:= OBJS = sha384.32.o
-$(CRYPTO:%=sha512_32_%)	:= OBJS = sha512.32.o
-$(CRYPTO:%=sha512_224_32_%) := OBJS = sha512_224.32.o
-$(CRYPTO:%=sha512_256_32_%) := OBJS = sha512_256.32.o
-$(CRYPTO:%=md5_32_%)	:= OBJS = md5.32.o
-
-$(CRYPTO:%=sha1_64_%)	:= OBJS = sha1.64.o
-$(CRYPTO:%=sha256_64_%)	:= OBJS = sha256.64.o
-$(CRYPTO:%=sha384_64_%)	:= OBJS = sha384.64.o
-$(CRYPTO:%=sha512_64_%)	:= OBJS = sha512.64.o
-$(CRYPTO:%=sha512_224_64_%) := OBJS = sha512_224.64.o
-$(CRYPTO:%=sha512_256_64_%) := OBJS = sha512_256.64.o
-$(CRYPTO:%=md5_64_%)	:= OBJS = md5.64.o
-
-$(PROGS_32)		:= OBJS_COMMON = main.32.o $(COMMONDIR)/testfuncs.32.o
-$(PROGS_64)		:= OBJS_COMMON = main.64.o $(COMMONDIR)/testfuncs.64.o
-$(PROGS_pkcs_32)	:= OBJS_COMMON += $(COMMONDIR)/cryptotest_pkcs.32.o
-$(PROGS_pkcs_64)	:= OBJS_COMMON += $(COMMONDIR)/cryptotest_pkcs.64.o
-$(PROGS_kcf_32)		:= OBJS_COMMON += $(COMMONDIR)/cryptotest_kcf.32.o
-$(PROGS_kcf_64)		:= OBJS_COMMON += $(COMMONDIR)/cryptotest_kcf.64.o
-
-CSTD = $(CSTD_GNU99)
-
-CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CPPFLAGS += -I$(COMMONDIR) -I$(SRC)/common/crypto
-
-LINTFLAGS += -xerroff=E_NAME_USED_NOT_DEF2
-LINTFLAGS += -xerroff=E_NAME_DEF_NOT_USED2
-
-$(PROGS_pkcs) := LDLIBS += -lpkcs11 -lcryptoutil
-
-CMDS_pkcs = $(PROGS_pkcs:%_pkcs=$(TESTDIR_pkcs)/%)
-CMDS_kcf = $(PROGS_kcf:%_kcf=$(TESTDIR_kcf)/%)
-CMDS = $(CMDS_pkcs) $(CMDS_kcf)
-
-$(CMDS) := FILEMODE = 0555
-
-all: $(PROGS)
-
-$(PROGS): main.32.o main.64.o
-
-%_32_pkcs: %.32.o
-	$(LINK.c) -o $@ $(OBJS) $(OBJS_COMMON) $(LDLIBS)
-	$(POST_PROCESS)
-
-%_64_pkcs: %.64.o
-	$(LINK64.c) -o $@ $(OBJS) $(OBJS_COMMON) $(LDLIBS)
-	$(POST_PROCESS)
-
-%_32_kcf: %.32.o
-	$(LINK.c) -o $@ $(OBJS) $(OBJS_COMMON) $(LDLIBS)
-	$(POST_PROCESS)
-
-%_64_kcf: %.64.o
-	$(LINK64.c) -o $@ $(OBJS) $(OBJS_COMMON) $(LDLIBS)
-	$(POST_PROCESS)
-
-%.32.o: %.c
-	$(COMPILE.c) -o $@ $<
-	$(POST_PROCESS_O)
-
-%.64.o: %.c
-	$(COMPILE64.c) -o $@ $<
-	$(POST_PROCESS_O)
-
-
-install: all $(CMDS)
-
-lint: $(CRYPTO:%=lint_%)
-lint_pkcs: $(ALGS:%=lint_pkcs_%)
-lint_kcf: $(ALGS_kcf:%=lint_kcf_%)
-
-lint_pkcs_%:
-	$(LINT.c) main.c $(@:lint_pkcs_%=%.c) $(OBJS_COMMON:%.o=%.c) $(LDLIBS)
-
-lint_pcf_%:
-	$(LINT.c) main.c $(@:lint_kcf_%=%.c) $(OBJS_COMMON:%.o=%.c) $(LDLIBS)
-
-clobber: clean
-	-$(RM) $(PROGS)
-
-clean:
-	-$(RM) $(ALGS:%=%.32.o) $(ALGS:%=%.64.o) main.32.o main.64.o
-
-$(CMDS): $(TESTDIR_pkcs) $(TESTDIR_kcf) $(PROGS)
-
-$(TESTDIR_pkcs) $(TESTDIR_kcf):
-	$(INS.dir)
-
-$(TESTDIR_pkcs)/%_32: %_32_pkcs
-	$(INS.rename)
-
-$(TESTDIR_pkcs)/%_64: %_64_pkcs
-	$(INS.rename)
-
-$(TESTDIR_kcf)/%_32: %_32_kcf
-	$(INS.rename)
-
-$(TESTDIR_kcf)/%_64: %_64_kcf
-	$(INS.rename)
+FRC:
diff --git a/usr/src/test/crypto-tests/tests/digest/Makefile.digest b/usr/src/test/crypto-tests/tests/digest/Makefile.digest
new file mode 100644
index 0000000000..1507ebc656
--- /dev/null
+++ b/usr/src/test/crypto-tests/tests/digest/Makefile.digest
@@ -0,0 +1,21 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2019 Joyent, Inc.
+#
+
+CRYPTO		= pkcs kcf
+COMMON_OBJS	= main.o
+
+TESTROOT	= $(ROOT)/opt/crypto-tests/tests/digest
+
+include $(SRC)/test/crypto-tests/tests/Makefile.crypto
diff --git a/usr/src/test/crypto-tests/tests/hmac/Makefile b/usr/src/test/crypto-tests/tests/hmac/Makefile
index f1f1c00314..d2600902b6 100644
--- a/usr/src/test/crypto-tests/tests/hmac/Makefile
+++ b/usr/src/test/crypto-tests/tests/hmac/Makefile
@@ -13,103 +13,18 @@
 # Copyright 2019 Joyent, Inc.
 #
 
-include $(SRC)/cmd/Makefile.cmd
-include $(SRC)/test/Makefile.com
-include $(SRC)/cmd/Makefile.ctf
+ALGS	= hmac_sha1
 
-ALGS = hmac_sha1
-CRYPTO = pkcs kcf
+all	:=	TARGET = all
+install	:=	TARGET = install
+clean	:=	TARGET = clean
+clobber	:=	TARGET = clobber
 
-PROGS_pkcs_32 = $(ALGS:%=%_32_pkcs)
-PROGS_pkcs_64 = $(ALGS:%=%_64_pkcs)
-PROGS_kcf_32 = $(ALGS:%=%_32_kcf)
-PROGS_kcf_64 = $(ALGS:%=%_64_kcf)
-PROGS_pkcs = $(PROGS_pkcs_32) $(PROGS_pkcs_64)
-PROGS_kcf = $(PROGS_kcf_32) $(PROGS_kcf_64)
-PROGS_32 = $(PROGS_pkcs_32) $(PROGS_kcf_32)
-PROGS_64 = $(PROGS_pkcs_64) $(PROGS_kcf_64)
-PROGS = $(PROGS_32) $(PROGS_64)
+.KEEP_STATE:
 
-ROOTOPTPKG = $(ROOT)/opt/crypto-tests
-TESTROOT = $(ROOTOPTPKG)/tests/hmac
-TESTDIR_pkcs = $(TESTROOT)/pkcs
-TESTDIR_kcf = $(TESTROOT)/kcf
+all clean clobber install: $(ALGS)
 
-COMMONDIR = ../common
+$(ALGS): FRC
+	$(MAKE) -e -f Makefile.hmac BASEPROG=$@ $(TARGET)
 
-$(CRYPTO:%=hmac_sha1_32_%)	:= OBJS = hmac_sha1.32.o
-$(CRYPTO:%=hmac_sha1_64_%)	:= OBJS = hmac_sha1.64.o
-
-$(PROGS_32)		:= OBJS_COMMON = main.32.o $(COMMONDIR)/testfuncs.32.o
-$(PROGS_64)		:= OBJS_COMMON = main.64.o $(COMMONDIR)/testfuncs.64.o
-$(PROGS_pkcs_32)	:= OBJS_COMMON += $(COMMONDIR)/cryptotest_pkcs.32.o
-$(PROGS_pkcs_64)	:= OBJS_COMMON += $(COMMONDIR)/cryptotest_pkcs.64.o
-$(PROGS_kcf_32)		:= OBJS_COMMON += $(COMMONDIR)/cryptotest_kcf.32.o
-$(PROGS_kcf_64)		:= OBJS_COMMON += $(COMMONDIR)/cryptotest_kcf.64.o
-
-CSTD = $(CSTD_GNU99)
-
-CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CPPFLAGS += -I$(COMMONDIR) -I$(SRC)/common/crypto
-
-$(PROGS_pkcs) := LDLIBS += -lpkcs11 -lcryptoutil
-
-CMDS_pkcs = $(PROGS_pkcs:%_pkcs=$(TESTDIR_pkcs)/%)
-CMDS_kcf = $(PROGS_kcf:%_kcf=$(TESTDIR_kcf)/%)
-CMDS = $(CMDS_pkcs) $(CMDS_kcf)
-
-$(CMDS) := FILEMODE = 0555
-
-all: $(PROGS)
-
-$(PROGS): main.32.o main.64.o
-
-%_32_pkcs: %.32.o
-	$(LINK.c) -o $@ $(OBJS) $(OBJS_COMMON) $(LDLIBS)
-	$(POST_PROCESS)
-
-%_64_pkcs: %.64.o
-	$(LINK64.c) -o $@ $(OBJS) $(OBJS_COMMON) $(LDLIBS)
-	$(POST_PROCESS)
-
-%_32_kcf: %.32.o
-	$(LINK.c) -o $@ $(OBJS) $(OBJS_COMMON) $(LDLIBS)
-	$(POST_PROCESS)
-
-%_64_kcf: %.64.o
-	$(LINK64.c) -o $@ $(OBJS) $(OBJS_COMMON) $(LDLIBS)
-	$(POST_PROCESS)
-
-%.32.o: %.c
-	$(COMPILE.c) -o $@ $<
-	$(POST_PROCESS_O)
-
-%.64.o: %.c
-	$(COMPILE64.c) -o $@ $<
-	$(POST_PROCESS_O)
-
-
-install: all $(CMDS)
-
-clobber: clean
-	-$(RM) $(PROGS)
-
-clean:
-	-$(RM) $(ALGS:%=%.32.o) $(ALGS:%=%.64.o) main.32.o main.64.o
-
-$(CMDS): $(TESTDIR_pkcs) $(TESTDIR_kcf) $(PROGS)
-
-$(TESTDIR_pkcs) $(TESTDIR_kcf):
-	$(INS.dir)
-
-$(TESTDIR_pkcs)/%_32: %_32_pkcs
-	$(INS.rename)
-
-$(TESTDIR_pkcs)/%_64: %_64_pkcs
-	$(INS.rename)
-
-$(TESTDIR_kcf)/%_32: %_32_kcf
-	$(INS.rename)
-
-$(TESTDIR_kcf)/%_64: %_64_kcf
-	$(INS.rename)
+FRC:
diff --git a/usr/src/test/crypto-tests/tests/hmac/Makefile.hmac b/usr/src/test/crypto-tests/tests/hmac/Makefile.hmac
new file mode 100644
index 0000000000..cad21ea9dc
--- /dev/null
+++ b/usr/src/test/crypto-tests/tests/hmac/Makefile.hmac
@@ -0,0 +1,21 @@
+#
+# This file and its contents are supplied under the terms of the
+# Common Development and Distribution License ("CDDL"), version 1.0.
+# You may only use this file in accordance with the terms of version
+# 1.0 of the CDDL.
+#
+# A full copy of the text of the CDDL should have accompanied this
+# source.  A copy of the CDDL is also available via the Internet at
+# http://www.illumos.org/license/CDDL.
+#
+
+#
+# Copyright 2019 Joyent, Inc.
+#
+
+CRYPTO		= pkcs kcf
+COMMON_OBJS	= main.o
+
+TESTROOT	= $(ROOT)/opt/crypto-tests/tests/hmac
+
+include $(SRC)/test/crypto-tests/tests/Makefile.crypto
diff --git a/usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs b/usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs
index f94bee509d..34149179e6 100644
--- a/usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs
+++ b/usr/src/test/crypto-tests/tests/modes/aes/Makefile.subdirs
@@ -10,96 +10,9 @@
 #
 
 #
-# Copyright (c) 2012 by Delphix. All rights reserved.
-# Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
 # Copyright 2019 Joyent, Inc.
 #
 
-include $(SRC)/cmd/Makefile.cmd
-include $(SRC)/test/Makefile.com
-include $(SRC)/cmd/Makefile.ctf
+TESTROOT = $(ROOT)/opt/crypto-tests/tests/aes
 
-PROGS_32 = $(CRYPTO:%=$(BASEPROG)_32_%)
-PROGS_64 = $(CRYPTO:%=$(BASEPROG)_64_%)
-PROGS = $(PROGS_32) $(PROGS_64)
-$(CRYPTO_pkcs)PROGS_pkcs = $(BASEPROG:%=%_32_pkcs) $(BASEPROG:%=%_64_pkcs)
-$(CRYPTO_kcf)PROGS_kcf = $(BASEPROG:%=%_32_kcf) $(BASEPROG:%=%_64_kcf)
-
-ROOTOPTPKG = $(ROOT)/opt/crypto-tests
-TESTROOT = $(ROOTOPTPKG)/tests/aes
-$(CRYPTO_pkcs)TESTDIR_pkcs = $(TESTROOT)/pkcs
-$(CRYPTO_kcf)TESTDIR_kcf = $(TESTROOT)/kcf
-
-COMMONDIR = ../../../common
-$(PROGS_32)	:= OBJS += $(COMMONDIR)/testfuncs.32.o
-$(PROGS_64)	:= OBJS += $(COMMONDIR)/testfuncs.64.o
-$(PROGS_32)	:= OBJS += $(BASEPROG:%=%.32.o)
-$(PROGS_64)	:= OBJS += $(BASEPROG:%=%.64.o)
-$(CRYPTO_pkcs)$(BASEPROG)_32_pkcs	:= OBJS += $(COMMONDIR)/cryptotest_pkcs.32.o
-$(CRYPTO_pkcs)$(BASEPROG)_64_pkcs	:= OBJS += $(COMMONDIR)/cryptotest_pkcs.64.o
-$(CRYPTO_kcf)$(BASEPROG)_32_kcf	:= OBJS += $(COMMONDIR)/cryptotest_kcf.32.o
-$(CRYPTO_kcf)$(BASEPROG)_64_kcf	:= OBJS += $(COMMONDIR)/cryptotest_kcf.64.o
-
-$(CRYPTO_pkcs)$(PROGS_pkcs)	:= LDLIBS += -lpkcs11 -lcryptoutil
-
-CSTD = $(CSTD_GNU99)
-
-$(CRYPTO_pkcs)CMDS_pkcs = $(PROGS_pkcs:%_pkcs=$(TESTDIR_pkcs)/%)
-$(CRYPTO_kcf)CMDS_kcf = $(PROGS_kcf:%_kcf=$(TESTDIR_kcf)/%)
-CMDS = $(CMDS_pkcs) $(CMDS_kcf)
-
-$(CMDS) := FILEMODE = 0555
-
-CPPFLAGS += -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
-CPPFLAGS += -I$(COMMONDIR) -I$(SRC)/common/crypto/
-
-all: $(PROGS)
-
-%_32_pkcs: %.32.o
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-%_64_pkcs: %.64.o
-	$(LINK64.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-%_32_kcf: %.32.o
-	$(LINK.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-%_64_kcf: %.64.o
-	$(LINK64.c) $(OBJS) -o $@ $(LDLIBS)
-	$(POST_PROCESS)
-
-%.32.o: %.c
-	$(COMPILE.c) -o $@ $<
-	$(POST_PROCESS_O)
-
-%.64.o: %.c
-	$(COMPILE64.c) -o $@ $<
-	$(POST_PROCESS_O)
-
-install: all $(CMDS)
-
-clobber: clean
-	-$(RM) $(PROGS)
-
-clean:
-	-$(RM) *.o
-
-$(CMDS): $(TESTDIR_pkcs) $(TESTDIR_kcf) $(PROGS)
-
-$(TESTDIR_pkcs) $(TESTDIR_kcf):
-	$(INS.dir)
-
-$(TESTDIR_pkcs)/%_32: %_32_pkcs
-	$(INS.rename)
-
-$(TESTDIR_pkcs)/%_64: %_64_pkcs
-	$(INS.rename)
-
-$(TESTDIR_kcf)/%_32: %_32_kcf
-	$(INS.rename)
-
-$(TESTDIR_kcf)/%_64: %_64_kcf
-	$(INS.rename)
+include $(SRC)/test/crypto-tests/tests/Makefile.crypto