67 files changed, 272 insertions, 243 deletions
diff --git a/trust/Makefile.am b/trust/Makefile.am
index d6d291f..322f812 100644
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -1,50 +1,35 @@
 
-include $(top_srcdir)/build/Makefile.decl
-
-SUBDIRS = . tests
-
-COMMON = $(top_srcdir)/common
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/common \
-	-DDATADIR=\"$(datadir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DPRIVATEDIR=\"$(privatedir)\" \
-	$(LIBTASN1_CFLAGS) \
-	$(NULL)
-
-noinst_LTLIBRARIES = \
+noinst_LTLIBRARIES += \
 	libtrust-testable.la \
 	libtrust-data.la
 
 libtrust_data_la_SOURCES = \
-	asn1.c asn1.h \
-	basic.asn basic.asn.h \
-	base64.c base64.h \
-	pem.c pem.h \
-	pkix.asn pkix.asn.h \
-	oid.c oid.h \
-	openssl.asn openssl.asn.h \
-	utf8.c utf8.h \
-	x509.c x509.h \
+	trust/asn1.c trust/asn1.h \
+	trust/basic.asn trust/basic.asn.h \
+	trust/base64.c trust/base64.h \
+	trust/pem.c trust/pem.h \
+	trust/pkix.asn trust/pkix.asn.h \
+	trust/oid.c trust/oid.h \
+	trust/openssl.asn trust/openssl.asn.h \
+	trust/utf8.c trust/utf8.h \
+	trust/x509.c trust/x509.h \
 	$(NULL)
 
-MODULE_SRCS = \
-	builder.c builder.h \
-	digest.c digest.h \
-	index.c index.h \
-	parser.c parser.h \
-	persist.c persist.h \
-	module.c module.h \
-	save.c save.h \
-	session.c session.h \
-	token.c token.h \
-	types.h \
+TRUST_SRCS = \
+	trust/builder.c trust/builder.h \
+	trust/digest.c trust/digest.h \
+	trust/index.c trust/index.h \
+	trust/parser.c trust/parser.h \
+	trust/persist.c trust/persist.h \
+	trust/module.c trust/module.h \
+	trust/save.c trust/save.h \
+	trust/session.c trust/session.h \
+	trust/token.c trust/token.h \
+	trust/types.h \
 	$(NULL)
 
 configdir = $(p11_package_config_modules)
-config_DATA = p11-kit-trust.module
+config_DATA = trust/p11-kit-trust.module
 
 moduledir = $(p11_module_path)
 module_LTLIBRARIES = \
@@ -55,8 +40,8 @@ p11_kit_trust_la_CFLAGS = \
 
 p11_kit_trust_la_LIBADD = \
 	libtrust-data.la \
-	$(top_builddir)/common/libp11-library.la \
-	$(top_builddir)/common/libp11-common.la \
+	libp11-library.la \
+	libp11-common.la \
 	$(LIBTASN1_LIBS) \
 	$(HASH_LIBS) \
 	$(NULL)
@@ -67,57 +52,205 @@ p11_kit_trust_la_LDFLAGS = \
 	-export-symbols-regex 'C_GetFunctionList' \
 	$(NULL)
 
-p11_kit_trust_la_SOURCES = $(MODULE_SRCS)
+p11_kit_trust_la_SOURCES = $(TRUST_SRCS)
 
 libtrust_testable_la_LDFLAGS = \
 	-no-undefined
 
-libtrust_testable_la_SOURCES = $(MODULE_SRCS)
+libtrust_testable_la_SOURCES = $(TRUST_SRCS)
 
-bin_PROGRAMS = \
-	trust
+bin_PROGRAMS += trust/trust
 
-trust_LDADD = \
+trust_trust_LDADD = \
 	libtrust-data.la \
-	$(top_builddir)/p11-kit/libp11-kit.la \
-	$(top_builddir)/common/libp11-common.la \
-	$(top_builddir)/common/libp11-tool.la \
+	libp11-kit.la \
+	libp11-common.la \
+	libp11-tool.la \
 	$(LTLIBINTL) \
 	$(LIBTASN1_LIBS) \
 	$(HASH_LIBS) \
 	$(NULL)
 
-trust_CFLAGS = \
-	-I$(top_srcdir)/p11-kit \
+trust_trust_CFLAGS = \
 	-DP11_KIT_FUTURE_UNSTABLE_API \
 	$(LIBTASN1_CFLAGS) \
 	$(NULL)
 
-trust_SOURCES = \
-	anchor.c anchor.h \
-	parser.c parser.h \
-	persist.c persist.h \
-	digest.c digest.h \
-	enumerate.c enumerate.h \
-	extract.c extract.h \
-	extract-jks.c \
-	extract-openssl.c \
-	extract-pem.c \
-	extract-cer.c \
-	list.c list.h \
-	openssl.asn openssl.asn.h \
-	save.c save.h \
-	trust.c \
+trust_trust_SOURCES = \
+	trust/anchor.c trust/anchor.h \
+	trust/parser.c trust/parser.h \
+	trust/persist.c trust/persist.h \
+	trust/digest.c trust/digest.h \
+	trust/enumerate.c trust/enumerate.h \
+	trust/extract.c trust/extract.h \
+	trust/extract-jks.c \
+	trust/extract-openssl.c \
+	trust/extract-pem.c \
+	trust/extract-cer.c \
+	trust/list.c trust/list.h \
+	trust/openssl.asn trust/openssl.asn.h \
+	trust/save.c trust/save.h \
+	trust/trust.c \
 	$(NULL)
 
 externaldir = $(privatedir)
 external_SCRIPTS = \
-	trust-extract-compat
+	trust/trust-extract-compat
 
-EXTRA_DIST = \
-	p11-kit-trust.module
+EXTRA_DIST += \
+	trust/p11-kit-trust.module
 
 asn:
-	asn1Parser -o pkix.asn.h pkix.asn
-	asn1Parser -o openssl.asn.h openssl.asn
-	asn1Parser -o basic.asn.h basic.asn
+	asn1Parser -o $(srcdir)/trust/pkix.asn.h $(srcdir)/trust/pkix.asn
+	asn1Parser -o $(srcdir)/trust/openssl.asn.h $(srcdir)/trust/openssl.asn
+	asn1Parser -o $(srcdir)/trust/basic.asn.h $(srcdir)/trust/basic.asn
+
+# Tests ----------------------------------------------------------------
+
+trust_LIBS = \
+	libtrust-testable.la \
+	libtrust-data.la \
+	libtrust-test.la \
+	libp11-kit.la \
+	libp11-library.la \
+	libp11-test.la \
+	libp11-common.la \
+	$(LIBTASN1_LIBS) \
+	$(HASH_LIBS) \
+	$(NULL)
+
+noinst_LTLIBRARIES += \
+	libtrust-test.la
+
+libtrust_test_la_SOURCES = \
+	trust/test-trust.c trust/test-trust.h \
+	trust/digest.c \
+	$(NULL)
+
+CHECK_PROGS += \
+	test-digest \
+	test-asn1 \
+	test-base64 \
+	test-pem \
+	test-oid \
+	test-utf8 \
+	test-x509 \
+	test-persist \
+	test-index \
+	test-parser \
+	test-builder \
+	test-token \
+	test-module \
+	test-save \
+	test-enumerate \
+	test-cer \
+	test-bundle \
+	test-openssl \
+	$(NULL)
+
+test_asn1_SOURCES = trust/test-asn1.c
+test_asn1_LDADD = $(trust_LIBS)
+
+test_base64_SOURCES = trust/test-base64.c
+test_base64_LDADD = $(trust_LIBS)
+
+test_builder_SOURCES = trust/test-builder.c
+test_builder_LDADD = $(trust_LIBS)
+
+test_bundle_SOURCES = trust/test-bundle.c
+test_bundle_LDADD = $(trust_LIBS)
+
+test_cer_SOURCES = trust/test-cer.c
+test_cer_LDADD = $(trust_LIBS)
+
+test_digest_SOURCES = trust/test-digest.c
+test_digest_LDADD = $(trust_LIBS)
+
+test_enumerate_SOURCES = trust/test-enumerate.c
+test_enumerate_LDADD = $(trust_LIBS)
+
+test_index_SOURCES = trust/test-index.c
+test_index_LDADD = $(trust_LIBS)
+
+test_module_SOURCES = trust/test-module.c
+test_module_LDADD = $(trust_LIBS)
+
+test_oid_SOURCES = trust/test-oid.c
+test_oid_LDADD = $(trust_LIBS)
+
+test_openssl_SOURCES = trust/test-openssl.c
+test_openssl_LDADD = $(trust_LIBS)
+
+test_parser_SOURCES = trust/test-parser.c
+test_parser_LDADD = $(trust_LIBS)
+
+test_pem_SOURCES = trust/test-pem.c
+test_pem_LDADD = $(trust_LIBS)
+
+test_persist_SOURCES = trust/test-persist.c
+test_persist_LDADD = $(trust_LIBS)
+
+test_save_SOURCES = trust/test-save.c
+test_save_LDADD = $(trust_LIBS)
+
+test_token_SOURCES = trust/test-token.c
+test_token_LDADD = $(trust_LIBS)
+
+test_utf8_SOURCES = trust/test-utf8.c
+test_utf8_LDADD = $(trust_LIBS)
+
+test_x509_SOURCES = trust/test-x509.c
+test_x509_LDADD = $(trust_LIBS)
+
+noinst_PROGRAMS += \
+	frob-pow \
+	frob-token \
+	frob-nss-trust \
+	frob-cert \
+	frob-bc \
+	frob-ku \
+	frob-eku \
+	frob-ext \
+	frob-oid \
+	$(NULL)
+
+frob_bc_SOURCES = trust/frob-bc.c
+frob_bc_LDADD = $(trust_LIBS)
+
+frob_cert_SOURCES = trust/frob-cert.c
+frob_cert_LDADD = $(trust_LIBS)
+
+frob_eku_SOURCES = trust/frob-eku.c
+frob_eku_LDADD = $(trust_LIBS)
+
+frob_ext_SOURCES = trust/frob-ext.c
+frob_ext_LDADD = $(trust_LIBS)
+
+frob_ku_SOURCES = trust/frob-ku.c
+frob_ku_LDADD = $(trust_LIBS)
+
+frob_nss_trust_SOURCES = trust/frob-nss-trust.c
+frob_nss_trust_LDADD = \
+	libp11-common.la \
+	libp11-kit.la \
+	$(HASH_LIBS) \
+	$(NULL)
+
+frob_oid_SOURCES = trust/frob-oid.c
+frob_oid_LDADD = $(trust_LIBS)
+
+frob_pow_SOURCES = trust/frob-pow.c
+frob_pow_LDADD = $(trust_LIBS)
+
+frob_token_SOURCES = trust/frob-token.c
+frob_token_LDADD = $(trust_LIBS)
+
+noinst_SCRIPTS += trust/test-extract
+
+installcheck-local:
+	sh $(builddir)/trust/test-extract
+
+EXTRA_DIST += \
+	trust/input \
+	trust/fixtures \
+	$(NULL)
diff --git a/trust/anchor.c b/trust/anchor.c
index cdc6486..baa1aeb 100644
--- a/trust/anchor.c
+++ b/trust/anchor.c
@@ -41,12 +41,13 @@
 #include "debug.h"
 #include "constants.h"
 #include "extract.h"
-#include "iter.h"
 #include "message.h"
 #include "parser.h"
-#include "p11-kit.h"
 #include "tool.h"
 
+#include "p11-kit/iter.h"
+#include "p11-kit/p11-kit.h"
+
 #include <assert.h>
 #include <getopt.h>
 #include <stdio.h>
diff --git a/trust/enumerate.h b/trust/enumerate.h
index d49bf16..8a18b06 100644
--- a/trust/enumerate.h
+++ b/trust/enumerate.h
@@ -40,8 +40,9 @@
 #include "array.h"
 #include "asn1.h"
 #include "dict.h"
-#include "iter.h"
-#include "pkcs11.h"
+
+#include "p11-kit/iter.h"
+#include "p11-kit/pkcs11.h"
 
 enum {
 	/* These overlap with the flags in save.h, so start higher */
diff --git a/trust/extract.c b/trust/extract.c
index 1bc406c..a008270 100644
--- a/trust/extract.c
+++ b/trust/extract.c
@@ -38,15 +38,16 @@
 #include "compat.h"
 #include "debug.h"
 #include "extract.h"
-#include "iter.h"
 #include "message.h"
 #include "oid.h"
 #include "path.h"
-#include "pkcs11.h"
 #include "pkcs11x.h"
 #include "save.h"
 #include "tool.h"
 
+#include "p11-kit/iter.h"
+#include "p11-kit/pkcs11.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
diff --git a/trust/tests/files/cacert-ca.der b/trust/fixtures/cacert-ca.der
index 719b0ff..719b0ff 100644
--- a/trust/tests/files/cacert-ca.der
+++ b/trust/fixtures/cacert-ca.der
diff --git a/trust/tests/files/cacert3-distrust-all.pem b/trust/fixtures/cacert3-distrust-all.pem
index ce5d887..ce5d887 100644
--- a/trust/tests/files/cacert3-distrust-all.pem
+++ b/trust/fixtures/cacert3-distrust-all.pem
diff --git a/trust/tests/files/cacert3-distrusted-all.pem b/trust/fixtures/cacert3-distrusted-all.pem
index 4a04a39..4a04a39 100644
--- a/trust/tests/files/cacert3-distrusted-all.pem
+++ b/trust/fixtures/cacert3-distrusted-all.pem
diff --git a/trust/tests/files/cacert3-not-trusted.pem b/trust/fixtures/cacert3-not-trusted.pem
index eaa2e54..eaa2e54 100644
--- a/trust/tests/files/cacert3-not-trusted.pem
+++ b/trust/fixtures/cacert3-not-trusted.pem
diff --git a/trust/tests/files/cacert3-trusted-alias.pem b/trust/fixtures/cacert3-trusted-alias.pem
index 44601ea..44601ea 100644
--- a/trust/tests/files/cacert3-trusted-alias.pem
+++ b/trust/fixtures/cacert3-trusted-alias.pem
diff --git a/trust/tests/files/cacert3-trusted-keyid.pem b/trust/fixtures/cacert3-trusted-keyid.pem
index e652733..e652733 100644
--- a/trust/tests/files/cacert3-trusted-keyid.pem
+++ b/trust/fixtures/cacert3-trusted-keyid.pem
diff --git a/trust/tests/files/cacert3-trusted-server-alias.pem b/trust/fixtures/cacert3-trusted-server-alias.pem
index 55593ec..55593ec 100644
--- a/trust/tests/files/cacert3-trusted-server-alias.pem
+++ b/trust/fixtures/cacert3-trusted-server-alias.pem
diff --git a/trust/tests/files/cacert3-trusted.pem b/trust/fixtures/cacert3-trusted.pem
index 55593ec..55593ec 100644
--- a/trust/tests/files/cacert3-trusted.pem
+++ b/trust/fixtures/cacert3-trusted.pem
diff --git a/trust/tests/files/cacert3-twice.pem b/trust/fixtures/cacert3-twice.pem
index c73202d..c73202d 100644
--- a/trust/tests/files/cacert3-twice.pem
+++ b/trust/fixtures/cacert3-twice.pem
diff --git a/trust/tests/files/cacert3.der b/trust/fixtures/cacert3.der
index 56f8c88..56f8c88 100644
--- a/trust/tests/files/cacert3.der
+++ b/trust/fixtures/cacert3.der
diff --git a/trust/tests/files/cacert3.pem b/trust/fixtures/cacert3.pem
index 087ca0e..087ca0e 100644
--- a/trust/tests/files/cacert3.pem
+++ b/trust/fixtures/cacert3.pem
diff --git a/trust/tests/files/distrusted.pem b/trust/fixtures/distrusted.pem
index 8de6ff0..8de6ff0 100644
--- a/trust/tests/files/distrusted.pem
+++ b/trust/fixtures/distrusted.pem
diff --git a/trust/tests/files/empty-file b/trust/fixtures/empty-file
index e69de29..e69de29 100644
--- a/trust/tests/files/empty-file
+++ b/trust/fixtures/empty-file
diff --git a/trust/tests/files/multiple.pem b/trust/fixtures/multiple.pem
index d3e1775..d3e1775 100644
--- a/trust/tests/files/multiple.pem
+++ b/trust/fixtures/multiple.pem
diff --git a/trust/tests/files/openssl-trust-no-trust.pem b/trust/fixtures/openssl-trust-no-trust.pem
index 07e3917..07e3917 100644
--- a/trust/tests/files/openssl-trust-no-trust.pem
+++ b/trust/fixtures/openssl-trust-no-trust.pem
diff --git a/trust/tests/files/redhat-ca.der b/trust/fixtures/redhat-ca.der
index affae24..affae24 100644
--- a/trust/tests/files/redhat-ca.der
+++ b/trust/fixtures/redhat-ca.der
diff --git a/trust/tests/files/self-signed-with-eku.der b/trust/fixtures/self-signed-with-eku.der
index 33e0760..33e0760 100644
--- a/trust/tests/files/self-signed-with-eku.der
+++ b/trust/fixtures/self-signed-with-eku.der
diff --git a/trust/tests/files/self-signed-with-ku.der b/trust/fixtures/self-signed-with-ku.der
index 51bb227..51bb227 100644
--- a/trust/tests/files/self-signed-with-ku.der
+++ b/trust/fixtures/self-signed-with-ku.der
diff --git a/trust/tests/files/simple-string b/trust/fixtures/simple-string
index be13474..be13474 100644
--- a/trust/tests/files/simple-string
+++ b/trust/fixtures/simple-string
diff --git a/trust/tests/files/testing-server.der b/trust/fixtures/testing-server.der
index cf2de65..cf2de65 100644
--- a/trust/tests/files/testing-server.der
+++ b/trust/fixtures/testing-server.der
diff --git a/trust/tests/files/thawte.pem b/trust/fixtures/thawte.pem
index 34af29e..34af29e 100644
--- a/trust/tests/files/thawte.pem
+++ b/trust/fixtures/thawte.pem
diff --git a/trust/tests/files/unrecognized-file.txt b/trust/fixtures/unrecognized-file.txt
index 4d5bac3..4d5bac3 100644
--- a/trust/tests/files/unrecognized-file.txt
+++ b/trust/fixtures/unrecognized-file.txt
diff --git a/trust/tests/files/verisign-v1.der b/trust/fixtures/verisign-v1.der
index bcd5ebb..bcd5ebb 100644
--- a/trust/tests/files/verisign-v1.der
+++ b/trust/fixtures/verisign-v1.der
diff --git a/trust/tests/files/verisign-v1.pem b/trust/fixtures/verisign-v1.pem
index ace4da5..ace4da5 100644
--- a/trust/tests/files/verisign-v1.pem
+++ b/trust/fixtures/verisign-v1.pem
diff --git a/trust/tests/frob-bc.c b/trust/frob-bc.c
index 41fbc58..41fbc58 100644
--- a/trust/tests/frob-bc.c
+++ b/trust/frob-bc.c
diff --git a/trust/tests/frob-cert.c b/trust/frob-cert.c
index c1bc45c..c1bc45c 100644
--- a/trust/tests/frob-cert.c
+++ b/trust/frob-cert.c
diff --git a/trust/tests/frob-eku.c b/trust/frob-eku.c
index f467b36..f467b36 100644
--- a/trust/tests/frob-eku.c
+++ b/trust/frob-eku.c
diff --git a/trust/tests/frob-ext.c b/trust/frob-ext.c
index 2017205..2017205 100644
--- a/trust/tests/frob-ext.c
+++ b/trust/frob-ext.c
diff --git a/trust/tests/frob-ku.c b/trust/frob-ku.c
index 99ac217..99ac217 100644
--- a/trust/tests/frob-ku.c
+++ b/trust/frob-ku.c
diff --git a/trust/tests/frob-multi-init.c b/trust/frob-multi-init.c
index d966540..d966540 100644
--- a/trust/tests/frob-multi-init.c
+++ b/trust/frob-multi-init.c
diff --git a/trust/tests/frob-nss-trust.c b/trust/frob-nss-trust.c
index fd69573..fd69573 100644
--- a/trust/tests/frob-nss-trust.c
+++ b/trust/frob-nss-trust.c
diff --git a/trust/tests/frob-oid.c b/trust/frob-oid.c
index 5a2499a..5a2499a 100644
--- a/trust/tests/frob-oid.c
+++ b/trust/frob-oid.c
diff --git a/trust/tests/frob-pow.c b/trust/frob-pow.c
index f029b2a..f029b2a 100644
--- a/trust/tests/frob-pow.c
+++ b/trust/frob-pow.c
diff --git a/trust/tests/frob-token.c b/trust/frob-token.c
index 5d57ec1..5d57ec1 100644
--- a/trust/tests/frob-token.c
+++ b/trust/frob-token.c
diff --git a/trust/tests/input/anchors/cacert3.der b/trust/input/anchors/cacert3.der
index 56f8c88..56f8c88 100644
--- a/trust/tests/input/anchors/cacert3.der
+++ b/trust/input/anchors/cacert3.der
diff --git a/trust/tests/input/anchors/testing-ca.der b/trust/input/anchors/testing-ca.der
index d3f70ea..d3f70ea 100644
--- a/trust/tests/input/anchors/testing-ca.der
+++ b/trust/input/anchors/testing-ca.der
diff --git a/trust/tests/input/blacklist/self-server.der b/trust/input/blacklist/self-server.der
index 68fe9af..68fe9af 100644
--- a/trust/tests/input/blacklist/self-server.der
+++ b/trust/input/blacklist/self-server.der
diff --git a/trust/tests/input/cacert-ca.der b/trust/input/cacert-ca.der
index 719b0ff..719b0ff 100644
--- a/trust/tests/input/cacert-ca.der
+++ b/trust/input/cacert-ca.der
diff --git a/trust/tests/input/distrusted.pem b/trust/input/distrusted.pem
index 8de6ff0..8de6ff0 100644
--- a/trust/tests/input/distrusted.pem
+++ b/trust/input/distrusted.pem
diff --git a/trust/tests/input/verisign-v1.p11-kit b/trust/input/verisign-v1.p11-kit
index eaa080d..eaa080d 100644
--- a/trust/tests/input/verisign-v1.p11-kit
+++ b/trust/input/verisign-v1.p11-kit
diff --git a/trust/list.c b/trust/list.c
index 8a172eb..a7fa4d9 100644
--- a/trust/list.c
+++ b/trust/list.c
@@ -40,12 +40,13 @@
 #include "constants.h"
 #include "debug.h"
 #include "enumerate.h"
-#include "iter.h"
 #include "list.h"
-#include "pkcs11x.h"
 #include "message.h"
+#include "pkcs11x.h"
 #include "tool.h"
 
+#include "p11-kit/iter.h"
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/trust/tests/test-asn1.c b/trust/test-asn1.c
index df75dfd..df75dfd 100644
--- a/trust/tests/test-asn1.c
+++ b/trust/test-asn1.c
diff --git a/trust/tests/test-base64.c b/trust/test-base64.c
index ce303e8..ce303e8 100644
--- a/trust/tests/test-base64.c
+++ b/trust/test-base64.c
diff --git a/trust/tests/test-builder.c b/trust/test-builder.c
index 29bac07..29bac07 100644
--- a/trust/tests/test-builder.c
+++ b/trust/test-builder.c
diff --git a/trust/tests/test-bundle.c b/trust/test-bundle.c
index 85c0b5f..a12d8a1 100644
--- a/trust/tests/test-bundle.c
+++ b/trust/test-bundle.c
@@ -128,7 +128,7 @@ test_file (void)
 	ret = p11_extract_pem_bundle (&test.ex, destination);
 	assert_num_eq (true, ret);
 
-	test_check_file (test.directory, "extract.pem", SRCDIR "/files/cacert3.pem");
+	test_check_file (test.directory, "extract.pem", SRCDIR "/trust/fixtures/cacert3.pem");
 
 	free (destination);
 }
@@ -151,7 +151,7 @@ test_file_multiple (void)
 	ret = p11_extract_pem_bundle (&test.ex, destination);
 	assert_num_eq (true, ret);
 
-	test_check_file (test.directory, "extract.pem", SRCDIR "/files/cacert3-twice.pem");
+	test_check_file (test.directory, "extract.pem", SRCDIR "/trust/fixtures/cacert3-twice.pem");
 
 	free (destination);
 }
@@ -195,8 +195,8 @@ test_directory (void)
 	assert_num_eq (true, ret);
 
 	test_check_directory (test.directory, ("Cacert3_Here.pem", "Cacert3_Here.1.pem", NULL));
-	test_check_file (test.directory, "Cacert3_Here.pem", SRCDIR "/files/cacert3.pem");
-	test_check_file (test.directory, "Cacert3_Here.1.pem", SRCDIR "/files/cacert3.pem");
+	test_check_file (test.directory, "Cacert3_Here.pem", SRCDIR "/trust/fixtures/cacert3.pem");
+	test_check_file (test.directory, "Cacert3_Here.1.pem", SRCDIR "/trust/fixtures/cacert3.pem");
 }
 
 static void
@@ -231,3 +231,7 @@ main (int argc,
 	p11_test (test_directory_empty, "/pem/test_directory_empty");
 	return p11_test_run (argc, argv);
 }
+
+#include "enumerate.c"
+#include "extract-pem.c"
+#include "save.c"
diff --git a/trust/tests/test-cer.c b/trust/test-cer.c
index ba0b9ca..422b528 100644
--- a/trust/tests/test-cer.c
+++ b/trust/test-cer.c
@@ -128,7 +128,7 @@ test_file (void)
 	ret = p11_extract_x509_file (&test.ex, destination);
 	assert_num_eq (true, ret);
 
-	test_check_file (test.directory, "extract.cer", SRCDIR "/files/cacert3.der");
+	test_check_file (test.directory, "extract.cer", SRCDIR "/trust/fixtures/cacert3.der");
 
 	free (destination);
 }
@@ -157,7 +157,7 @@ test_file_multiple (void)
 
 	p11_message_loud ();
 
-	test_check_file (test.directory, "extract.cer", SRCDIR "/files/cacert3.der");
+	test_check_file (test.directory, "extract.cer", SRCDIR "/trust/fixtures/cacert3.der");
 
 	free (destination);
 }
@@ -205,8 +205,8 @@ test_directory (void)
 	assert_num_eq (true, ret);
 
 	test_check_directory (test.directory, ("Cacert3_Here.cer", "Cacert3_Here.1.cer", NULL));
-	test_check_file (test.directory, "Cacert3_Here.cer", SRCDIR "/files/cacert3.der");
-	test_check_file (test.directory, "Cacert3_Here.1.cer", SRCDIR "/files/cacert3.der");
+	test_check_file (test.directory, "Cacert3_Here.cer", SRCDIR "/trust/fixtures/cacert3.der");
+	test_check_file (test.directory, "Cacert3_Here.1.cer", SRCDIR "/trust/fixtures/cacert3.der");
 }
 
 static void
@@ -241,3 +241,7 @@ main (int argc,
 	p11_test (test_directory_empty, "/x509/test_directory_empty");
 	return p11_test_run (argc, argv);
 }
+
+#include "enumerate.c"
+#include "extract-cer.c"
+#include "save.c"
diff --git a/trust/tests/test-digest.c b/trust/test-digest.c
index f2cb669..f2cb669 100644
--- a/trust/tests/test-digest.c
+++ b/trust/test-digest.c
diff --git a/trust/tests/test-enumerate.c b/trust/test-enumerate.c
index 75d3f16..e11373f 100644
--- a/trust/tests/test-enumerate.c
+++ b/trust/test-enumerate.c
@@ -534,3 +534,5 @@ main (int argc,
 
 	return p11_test_run (argc, argv);
 }
+
+#include "enumerate.c"
diff --git a/trust/tests/test-extract.in b/trust/test-extract.in
index 59f6cd6..59f6cd6 100644
--- a/trust/tests/test-extract.in
+++ b/trust/test-extract.in
diff --git a/trust/tests/test-index.c b/trust/test-index.c
index fc861b2..fc861b2 100644
--- a/trust/tests/test-index.c
+++ b/trust/test-index.c
diff --git a/trust/tests/test-module.c b/trust/test-module.c
index c272a88..3eedc1b 100644
--- a/trust/tests/test-module.c
+++ b/trust/test-module.c
@@ -88,9 +88,9 @@ setup (void *unused)
 	assert (rv == CKR_OK);
 
 	memset (&args, 0, sizeof (args));
-	paths = SRCDIR "/input" P11_PATH_SEP \
-		SRCDIR "/files/self-signed-with-ku.der" P11_PATH_SEP \
-		SRCDIR "/files/thawte.pem";
+	paths = SRCDIR "/trust/input" P11_PATH_SEP \
+		SRCDIR "/trust/fixtures/self-signed-with-ku.der" P11_PATH_SEP \
+		SRCDIR "/trust/fixtures/thawte.pem";
 	if (asprintf (&arguments, "paths='%s'", paths) < 0)
 		assert (false && "not reached");
 	args.pReserved = arguments;
@@ -266,9 +266,9 @@ test_get_slot_info (void)
 
 	/* These are the paths passed in in setup() */
 	const char *paths[] = {
-		SRCDIR "/input",
-		SRCDIR "/files/self-signed-with-ku.der",
-		SRCDIR "/files/thawte.pem"
+		SRCDIR "/trust/input",
+		SRCDIR "/trust/fixtures/self-signed-with-ku.der",
+		SRCDIR "/trust/fixtures/thawte.pem"
 	};
 
 	count = NUM_SLOTS;
@@ -314,8 +314,8 @@ test_get_token_info (void)
 
 	memset (&args, 0, sizeof (args));
 	args.pReserved = "paths='" \
-		SYSCONFDIR "/input" P11_PATH_SEP \
-		DATADIR "/files/blah" P11_PATH_SEP \
+		SYSCONFDIR "/trust/input" P11_PATH_SEP \
+		DATADIR "/trust/fixtures/blah" P11_PATH_SEP \
 		"/some/other/path/the-basename'";
 	args.flags = CKF_OS_LOCKING_OK;
 
diff --git a/trust/tests/test-oid.c b/trust/test-oid.c
index 0635d0a..0635d0a 100644
--- a/trust/tests/test-oid.c
+++ b/trust/test-oid.c
diff --git a/trust/tests/test-openssl.c b/trust/test-openssl.c
index 583ce24..9f7c4d6 100644
--- a/trust/tests/test-openssl.c
+++ b/trust/test-openssl.c
@@ -192,7 +192,7 @@ test_file (void)
 	assert_num_eq (true, ret);
 
 	test_check_file (test.directory, "extract.pem",
-	                 SRCDIR "/files/cacert3-trusted-server-alias.pem");
+	                 SRCDIR "/trust/fixtures/cacert3-trusted-server-alias.pem");
 
 	free (destination);
 }
@@ -215,7 +215,7 @@ test_plain (void)
 	assert_num_eq (true, ret);
 
 	test_check_file (test.directory, "extract.pem",
-	                 SRCDIR "/files/cacert3-trusted-alias.pem");
+	                 SRCDIR "/trust/fixtures/cacert3-trusted-alias.pem");
 
 	free (destination);
 }
@@ -256,7 +256,7 @@ test_keyid (void)
 	assert_num_eq (true, ret);
 
 	test_check_file (test.directory, "extract.pem",
-	                 SRCDIR "/files/cacert3-trusted-keyid.pem");
+	                 SRCDIR "/trust/fixtures/cacert3-trusted-keyid.pem");
 
 	free (destination);
 }
@@ -287,7 +287,7 @@ test_not_authority (void)
 	assert_num_eq (true, ret);
 
 	test_check_file (test.directory, "extract.pem",
-	                 SRCDIR "/files/cacert3-not-trusted.pem");
+	                 SRCDIR "/trust/fixtures/cacert3-not-trusted.pem");
 
 	free (destination);
 }
@@ -319,7 +319,7 @@ test_distrust_all (void)
 	assert_num_eq (true, ret);
 
 	test_check_file (test.directory, "extract.pem",
-	                 SRCDIR "/files/cacert3-distrust-all.pem");
+	                 SRCDIR "/trust/fixtures/cacert3-distrust-all.pem");
 
 	free (destination);
 }
@@ -347,7 +347,7 @@ test_file_multiple (void)
 	ret = p11_extract_openssl_bundle (&test.ex, destination);
 	assert_num_eq (true, ret);
 
-	test_check_file (test.directory, "extract.pem", SRCDIR "/files/multiple.pem");
+	test_check_file (test.directory, "extract.pem", SRCDIR "/trust/fixtures/multiple.pem");
 	free (destination);
 }
 
@@ -600,9 +600,9 @@ test_directory (void)
 #endif
 	                                           NULL));
 	test_check_file (test.directory, "Custom_Label.pem",
-	                 SRCDIR "/files/cacert3-trusted-server-alias.pem");
+	                 SRCDIR "/trust/fixtures/cacert3-trusted-server-alias.pem");
 	test_check_file (test.directory, "Custom_Label.1.pem",
-	                 SRCDIR "/files/cacert3-trusted-server-alias.pem");
+	                 SRCDIR "/trust/fixtures/cacert3-trusted-server-alias.pem");
 #ifdef OS_UNIX
 	test_check_symlink (test.directory, "e5662767.0", "Custom_Label.pem");
 	test_check_symlink (test.directory, "e5662767.1", "Custom_Label.1.pem");
@@ -656,3 +656,7 @@ main (int argc,
 
 	return p11_test_run (argc, argv);
 }
+
+#include "enumerate.c"
+#include "extract-openssl.c"
+#include "save.c"
diff --git a/trust/tests/test-parser.c b/trust/test-parser.c
index c6cfe9a..bdb67df 100644
--- a/trust/tests/test-parser.c
+++ b/trust/test-parser.c
@@ -118,7 +118,7 @@ test_parse_der_certificate (void)
 	};
 
 	p11_parser_formats (test.parser, p11_parser_format_x509, NULL);
-	ret = p11_parse_file (test.parser, SRCDIR "/files/cacert3.der", NULL,
+	ret = p11_parse_file (test.parser, SRCDIR "/trust/fixtures/cacert3.der", NULL,
 	                      P11_PARSE_FLAG_NONE);
 	assert_num_eq (P11_PARSE_SUCCESS, ret);
 
@@ -146,7 +146,7 @@ test_parse_pem_certificate (void)
 	};
 
 	p11_parser_formats (test.parser, p11_parser_format_pem, NULL);
-	ret = p11_parse_file (test.parser, SRCDIR "/files/cacert3.pem", NULL,
+	ret = p11_parse_file (test.parser, SRCDIR "/trust/fixtures/cacert3.pem", NULL,
 	                      P11_PARSE_FLAG_NONE);
 	assert_num_eq (P11_PARSE_SUCCESS, ret);
 
@@ -173,7 +173,7 @@ test_parse_p11_kit_persist (void)
 	};
 
 	p11_parser_formats (test.parser, p11_parser_format_persist, NULL);
-	ret = p11_parse_file (test.parser, SRCDIR "/input/verisign-v1.p11-kit", NULL,
+	ret = p11_parse_file (test.parser, SRCDIR "/trust/input/verisign-v1.p11-kit", NULL,
 	                      P11_PARSE_FLAG_NONE);
 	assert_num_eq (P11_PARSE_SUCCESS, ret);
 
@@ -226,7 +226,7 @@ test_parse_openssl_trusted (void)
 	int i;
 
 	p11_parser_formats (test.parser, p11_parser_format_pem, NULL);
-	ret = p11_parse_file (test.parser, SRCDIR "/files/cacert3-trusted.pem", NULL,
+	ret = p11_parse_file (test.parser, SRCDIR "/trust/fixtures/cacert3-trusted.pem", NULL,
 	                      P11_PARSE_FLAG_ANCHOR);
 	assert_num_eq (P11_PARSE_SUCCESS, ret);
 
@@ -310,7 +310,7 @@ test_parse_openssl_distrusted (void)
 	 * so we parse this as an anchor, but expect it to be blacklisted
 	 */
 	p11_parser_formats (test.parser, p11_parser_format_pem, NULL);
-	ret = p11_parse_file (test.parser, SRCDIR "/files/distrusted.pem", NULL,
+	ret = p11_parse_file (test.parser, SRCDIR "/trust/fixtures/distrusted.pem", NULL,
 	                      P11_PARSE_FLAG_ANCHOR);
 	assert_num_eq (P11_PARSE_SUCCESS, ret);
 
@@ -426,7 +426,7 @@ test_openssl_trusted_no_trust (void)
 	};
 
 	p11_parser_formats (test.parser, p11_parser_format_pem, NULL);
-	ret = p11_parse_file (test.parser, SRCDIR "/files/openssl-trust-no-trust.pem", NULL,
+	ret = p11_parse_file (test.parser, SRCDIR "/trust/fixtures/openssl-trust-no-trust.pem", NULL,
 	                      P11_PARSE_FLAG_NONE);
 	assert_num_eq (P11_PARSE_SUCCESS, ret);
 
@@ -454,7 +454,7 @@ test_parse_anchor (void)
 	int ret;
 
 	p11_parser_formats (test.parser, p11_parser_format_x509, NULL);
-	ret = p11_parse_file (test.parser, SRCDIR "/files/cacert3.der", NULL,
+	ret = p11_parse_file (test.parser, SRCDIR "/trust/fixtures/cacert3.der", NULL,
 	                      P11_PARSE_FLAG_ANCHOR);
 	assert_num_eq (P11_PARSE_SUCCESS, ret);
 
@@ -484,7 +484,7 @@ test_parse_thawte (void)
 	};
 
 	p11_parser_formats (test.parser, p11_parser_format_pem, NULL);
-	ret = p11_parse_file (test.parser, SRCDIR "/files/thawte.pem", NULL,
+	ret = p11_parse_file (test.parser, SRCDIR "/trust/fixtures/thawte.pem", NULL,
 	                      P11_PARSE_FLAG_NONE);
 	assert_num_eq (P11_PARSE_SUCCESS, ret);
 
@@ -520,7 +520,7 @@ test_parse_unrecognized (void)
 	p11_message_quiet ();
 
 	p11_parser_formats (test.parser, p11_parser_format_x509, NULL);
-	ret = p11_parse_file (test.parser, SRCDIR "/files/unrecognized-file.txt", NULL,
+	ret = p11_parse_file (test.parser, SRCDIR "/trust/fixtures/unrecognized-file.txt", NULL,
 	                      P11_PARSE_FLAG_NONE);
 	assert_num_eq (P11_PARSE_UNRECOGNIZED, ret);
 
@@ -537,7 +537,7 @@ test_parse_no_asn1_cache (void)
 	assert_ptr_not_null (parser);
 
 	p11_parser_formats (parser, p11_parser_format_x509, NULL);
-	ret = p11_parse_file (parser, SRCDIR "/files/cacert3.der", NULL, P11_PARSE_FLAG_NONE);
+	ret = p11_parse_file (parser, SRCDIR "/trust/fixtures/cacert3.der", NULL, P11_PARSE_FLAG_NONE);
 	assert_num_eq (P11_PARSE_SUCCESS, ret);
 
 	/* Should have gotten certificate  */
diff --git a/trust/tests/test-pem.c b/trust/test-pem.c
index 0c7d60a..0c7d60a 100644
--- a/trust/tests/test-pem.c
+++ b/trust/test-pem.c
diff --git a/trust/tests/test-persist.c b/trust/test-persist.c
index 107f131..107f131 100644
--- a/trust/tests/test-persist.c
+++ b/trust/test-persist.c
diff --git a/trust/tests/test-save.c b/trust/test-save.c
index be16141..1de798d 100644
--- a/trust/tests/test-save.c
+++ b/trust/test-save.c
@@ -110,7 +110,7 @@ test_file_write (void)
 	assert_num_eq (true, ret);
 	free (filename);
 
-	test_check_file (test.directory, "extract-file", SRCDIR "/files/cacert3.der");
+	test_check_file (test.directory, "extract-file", SRCDIR "/trust/fixtures/cacert3.der");
 }
 
 static void
@@ -176,7 +176,7 @@ test_file_overwrite (void)
 	assert_num_eq (true, ret);
 	free (filename);
 
-	test_check_file (test.directory, "extract-file", SRCDIR "/files/cacert3.der");
+	test_check_file (test.directory, "extract-file", SRCDIR "/trust/fixtures/cacert3.der");
 }
 
 static void
@@ -198,8 +198,8 @@ test_file_unique (void)
 	assert_num_eq (true, ret);
 	free (filename);
 
-	test_check_file (test.directory, "extract-file", SRCDIR "/files/empty-file");
-	test_check_file (test.directory, "extract-file.1", SRCDIR "/files/cacert3.der");
+	test_check_file (test.directory, "extract-file", SRCDIR "/trust/fixtures/empty-file");
+	test_check_file (test.directory, "extract-file.1", SRCDIR "/trust/fixtures/cacert3.der");
 }
 
 static void
@@ -219,7 +219,7 @@ test_file_auto_empty (void)
 	assert_num_eq (true, ret);
 	free (filename);
 
-	test_check_file (test.directory, "extract-file", SRCDIR "/files/empty-file");
+	test_check_file (test.directory, "extract-file", SRCDIR "/trust/fixtures/empty-file");
 }
 
 static void
@@ -239,7 +239,7 @@ test_file_auto_length (void)
 	assert_num_eq (true, ret);
 	free (filename);
 
-	test_check_file (test.directory, "extract-file", SRCDIR "/files/simple-string");
+	test_check_file (test.directory, "extract-file", SRCDIR "/trust/fixtures/simple-string");
 }
 
 static void
@@ -362,7 +362,7 @@ test_directory_files (void)
 	                      "link.ext",
 #endif
 	                      NULL));
-	test_check_file (subdir, "blah.cer", SRCDIR "/files/cacert3.der");
+	test_check_file (subdir, "blah.cer", SRCDIR "/trust/fixtures/cacert3.der");
 	test_check_data (subdir, "file.txt", test_text, strlen (test_text));
 #ifdef OS_UNIX
 	test_check_symlink (subdir, "link.ext", "/the/destination");
diff --git a/trust/tests/test-token.c b/trust/test-token.c
index a24539e..c643f7e 100644
--- a/trust/tests/test-token.c
+++ b/trust/test-token.c
@@ -760,8 +760,8 @@ main (int argc,
       char *argv[])
 {
 	p11_fixture (setup, teardown);
-	p11_testx (test_token_load, SRCDIR "/input", "/token/load");
-	p11_testx (test_token_flags, SRCDIR "/input", "/token/flags");
+	p11_testx (test_token_load, SRCDIR "/trust/input", "/token/load");
+	p11_testx (test_token_flags, SRCDIR "/trust/input", "/token/flags");
 	p11_testx (test_token_path, "/wheee", "/token/path");
 	p11_testx (test_token_label, "/wheee", "/token/label");
 	p11_testx (test_token_slot, "/unneeded", "/token/slot");
diff --git a/trust/tests/test-trust.c b/trust/test-trust.c
index 20306e0..20306e0 100644
--- a/trust/tests/test-trust.c
+++ b/trust/test-trust.c
diff --git a/trust/tests/test-trust.h b/trust/test-trust.h
index b70bbdb..b70bbdb 100644
--- a/trust/tests/test-trust.h
+++ b/trust/test-trust.h
diff --git a/trust/tests/test-utf8.c b/trust/test-utf8.c
index 9b2c3d5..9b2c3d5 100644
--- a/trust/tests/test-utf8.c
+++ b/trust/test-utf8.c
diff --git a/trust/tests/test-x509.c b/trust/test-x509.c
index 9f7d258..9f7d258 100644
--- a/trust/tests/test-x509.c
+++ b/trust/test-x509.c
diff --git a/trust/tests/Makefile.am b/trust/tests/Makefile.am
deleted file mode 100644
index 1f13b2a..0000000
--- a/trust/tests/Makefile.am
+++ /dev/null
@@ -1,122 +0,0 @@
-
-include $(top_srcdir)/build/Makefile.tests
-
-COMMON = $(top_srcdir)/common
-TRUST = $(top_srcdir)/trust
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir) \
-	-I$(srcdir)/.. \
-	-I$(top_srcdir)/p11-kit \
-	-I$(COMMON) \
-	-DDATADIR=\"$(datadir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DP11_KIT_FUTURE_UNSTABLE_API \
-	$(LIBTASN1_CFLAGS) \
-	$(TEST_CFLAGS) \
-	$(NULL)
-
-noinst_LTLIBRARIES = \
-	libtrust-test.la
-
-libtrust_test_la_SOURCES = \
-	test-trust.c test-trust.h \
-	$(TRUST)/digest.c
-
-LDADD = \
-	$(top_builddir)/trust/libtrust-testable.la \
-	$(top_builddir)/trust/libtrust-data.la \
-	$(builddir)/libtrust-test.la \
-	$(top_builddir)/p11-kit/libp11-kit.la \
-	$(top_builddir)/common/libp11-library.la \
-	$(top_builddir)/common/libp11-test.la \
-	$(top_builddir)/common/libp11-common.la \
-	$(LIBTASN1_LIBS) \
-	$(HASH_LIBS) \
-	$(NULL)
-
-CHECK_PROGS = \
-	test-digest \
-	test-asn1 \
-	test-base64 \
-	test-pem \
-	test-oid \
-	test-utf8 \
-	test-x509 \
-	test-persist \
-	test-index \
-	test-parser \
-	test-builder \
-	test-token \
-	test-module \
-	test-save \
-	test-enumerate \
-	test-cer \
-	test-bundle \
-	test-openssl \
-	$(NULL)
-
-noinst_PROGRAMS = \
-	frob-pow \
-	frob-token \
-	frob-nss-trust \
-	frob-cert \
-	frob-bc \
-	frob-ku \
-	frob-eku \
-	frob-ext \
-	frob-cert \
-	frob-oid \
-	$(CHECK_PROGS)
-
-frob_nss_trust_LDADD = \
-	$(top_builddir)/common/libp11-common.la \
-	$(top_builddir)/p11-kit/libp11-kit.la \
-	$(HASH_LIBS) \
-	$(NULL)
-
-TESTS = $(CHECK_PROGS)
-
-EXTRA_DIST = \
-	input \
-	files \
-	$(NULL)
-
-TEST_RUNNER = libtool --mode=execute
-
-test_save_SOURCES = \
-	test-save.c \
-	$(TRUST)/save.c \
-	$(NULL)
-
-test_enumerate_SOURCES = \
-	test-enumerate.c \
-	$(TRUST)/enumerate.c \
-	$(NULL)
-
-test_cer_SOURCES = \
-	test-cer.c \
-	$(TRUST)/enumerate.c \
-	$(TRUST)/extract-cer.c \
-	$(TRUST)/save.c \
-	$(NULL)
-
-test_bundle_SOURCES = \
-	test-bundle.c \
-	$(TRUST)/enumerate.c \
-	$(TRUST)/extract-pem.c \
-	$(TRUST)/save.c \
-	$(NULL)
-
-test_openssl_SOURCES = \
-	test-openssl.c \
-	$(TRUST)/enumerate.c \
-	$(TRUST)/extract-openssl.c \
-	$(TRUST)/save.c \
-	$(NULL)
-
-noinst_SCRIPTS = \
-	test-extract
-
-installcheck-local:
-	sh $(builddir)/test-extract