From b2dcc88fdd18902f12da9ef0ba9287123acb3118 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Wed, 17 Jul 2024 14:26:39 +0200
Subject: [PATCH] Move the check for the p11-kit to proxy script

The softhsm no longer uses the p11-kit proxy.

It is not relevant to kryoptic either.

Signed-off-by: Jakub Jelen <jjelen@redhat.com>
---
 tests/setup-kryoptic.sh | 1 -
 tests/setup-softhsm.sh  | 6 ------
 tests/softhsm-proxy.sh  | 5 +++++
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tests/setup-kryoptic.sh b/tests/setup-kryoptic.sh
index 8b8e32d6..62cc7543 100755
--- a/tests/setup-kryoptic.sh
+++ b/tests/setup-kryoptic.sh
@@ -403,7 +403,6 @@ sed -e "s|@libtoollibs@|${LIBSPATH}|g" \
 title LINE "Export test variables to ${TMPPDIR}/testvars"
 cat >> "${TMPPDIR}/testvars" <<DBGSCRIPT
 export P11LIB=${P11LIB}
-export P11KITCLIENTPATH=${P11KITCLIENTPATH}
 export PKCS11_PROVIDER_MODULE=${P11LIB}
 export PKCS11_PROVIDER_DEBUG="file:${TMPPDIR}/p11prov-debug.log"
 export OPENSSL_CONF="${OPENSSL_CONF}"
diff --git a/tests/setup-softhsm.sh b/tests/setup-softhsm.sh
index d6ce7210..24fcbf4f 100755
--- a/tests/setup-softhsm.sh
+++ b/tests/setup-softhsm.sh
@@ -39,11 +39,6 @@ else
 	sed_inplace=("-i" "")
 fi
 
-if [ "$P11KITCLIENTPATH" = "" ]; then
-    echo "Missing P11KITCLIENTPATH env variable"
-    exit 0
-fi
-
 find_softhsm() {
     for _lib in "$@" ; do
         if test -f "$_lib" ; then
@@ -392,7 +387,6 @@ sed -e "s|@libtoollibs@|${LIBSPATH}|g" \
 title LINE "Export test variables to ${TMPPDIR}/testvars"
 cat >> "${TMPPDIR}/testvars" <<DBGSCRIPT
 export P11LIB=${P11LIB}
-export P11KITCLIENTPATH=${P11KITCLIENTPATH}
 export PKCS11_PROVIDER_MODULE=${P11LIB}
 export PKCS11_PROVIDER_DEBUG="file:${TMPPDIR}/p11prov-debug.log"
 export OPENSSL_CONF="${OPENSSL_CONF}"
diff --git a/tests/softhsm-proxy.sh b/tests/softhsm-proxy.sh
index dd9fd0b0..20dd434d 100755
--- a/tests/softhsm-proxy.sh
+++ b/tests/softhsm-proxy.sh
@@ -9,6 +9,11 @@ if [ -z "$XDG_RUNTIME_DIR" ]; then
     export XDG_RUNTIME_DIR=$PWD
 fi
 
+if [ "$P11KITCLIENTPATH" = "" ]; then
+    echo "Missing P11KITCLIENTPATH env variable"
+    exit 0
+fi
+
 title PARA "Start the p11-kit server and check if it works"
 # shellcheck disable=SC2046 # we want to split these for eval
 eval $(p11-kit server --provider "$P11LIB" "pkcs11:")