From dad302fc2578b97b59b52739c7f35dc6668d0010 Mon Sep 17 00:00:00 2001 From: Holger Dengler Date: Tue, 14 May 2024 12:11:27 +0200 Subject: [PATCH 1/2] github: install missing pidof tool Signed-off-by: Holger Dengler --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 891eaef..ef9d639 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,7 +30,8 @@ jobs: dnf -y install gcc g++ fi if [ "${{ matrix.token }}" = "ock" ]; then - dnf -y install opencryptoki opencryptoki-swtok gnutls-utils + dnf -y install opencryptoki opencryptoki-swtok gnutls-utils \ + procps-ng fi fi - name: Prep soft-tokens From d1b0932e39614a6b8aa3b792308ca588c1e35aab Mon Sep 17 00:00:00 2001 From: Holger Dengler Date: Tue, 14 May 2024 15:42:06 +0200 Subject: [PATCH 2/2] tests: add more output to setup-ock Signed-off-by: Holger Dengler --- tests/setup-ock.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/setup-ock.sh b/tests/setup-ock.sh index 4918145..7cd1fe8 100755 --- a/tests/setup-ock.sh +++ b/tests/setup-ock.sh @@ -35,6 +35,11 @@ if [ $? -eq 1 ]; then exit 77 fi +####################################### +echo "## List tokens" +GNUTLS_PIN=${OCK_USER_PIN} \ +${P11TOOL} --list-token-urls + echo "##################################################" echo "## Setup test environment (module: ock)" echo "##" @@ -128,6 +133,10 @@ ${P11TOOL} --write --label ${LABEL} \ "${URI_TOKEN}" 2> /dev/null \ || exit 99 +GNUTLS_PIN=${OCK_USER_PIN} \ +${P11TOOL} --list-keys \ + "${URI_TOKEN}" 2> /dev/null + ####################################### echo "## Generate openssl config file" OPENSSL_CONF=${TMPPDIR}/pkcs11sign.cnf