summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--trust/Makefile.am4
-rw-r--r--trust/test-trust.sh21
2 files changed, 24 insertions, 1 deletions
diff --git a/trust/Makefile.am b/trust/Makefile.am
index dfc64eb..cb9de25 100644
--- a/trust/Makefile.am
+++ b/trust/Makefile.am
@@ -303,15 +303,17 @@ frob_token_SOURCES = trust/frob-token.c
frob_token_LDADD = $(trust_LIBS)
frob_token_CFLAGS = $(trust_CFLAGS)
-noinst_SCRIPTS += trust/test-extract.sh
+noinst_SCRIPTS += trust/test-extract.sh trust/test-trust.sh
if !OS_WIN32
installcheck-local:
builddir="$(abs_top_builddir)/trust" $(SHELL) $(srcdir)/trust/test-extract.sh
+ builddir="$(abs_top_builddir)/trust" $(SHELL) $(srcdir)/trust/test-trust.sh
endif
EXTRA_DIST += \
trust/input \
trust/fixtures \
trust/test-extract.sh \
+ trust/test-trust.sh \
$(NULL)
diff --git a/trust/test-trust.sh b/trust/test-trust.sh
new file mode 100644
index 0000000..03f2988
--- /dev/null
+++ b/trust/test-trust.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+. "${builddir=.}/test-init.sh"
+
+test_disable_in_proxy()
+{
+ : ${PKCS11_TOOL=pkcs11-tool}
+ if ! (type ${PKCS11_TOOL}) > /dev/null 2>&1; then
+ skip "pkcs11-tool not found"
+ fi
+ : ${PKG_CONFIG=pkg-config}
+ if ! (type ${PKG_CONFIG}) > /dev/null 2>&1; then
+ skip "pkg-config not found"
+ fi
+ proxy_module=$(${PKG_CONFIG} --variable=proxy_module p11-kit-1)
+ if ${PKCS11_TOOL} --module="$proxy_module" -T | grep '^ *token model *: *p11-kit-trust' > /dev/null 2>&1; then
+ assert_fail "p11-kit-trust is not disabled in proxy module"
+ fi
+}
+
+run test_disable_in_proxy