tests: testpkcs11.sh was moved to the main tests

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

16 files changed, 53 insertions, 52 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 15ce1908ff..18814bf3f5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -64,7 +64,10 @@ EXTRA_DIST = suppressions.valgrind eagain-common.h cert-common.h test-chains.h \
 	data/listings-SSL3.0-TLS1.1 p11-kit-trust-data/Example_Root_CA.p11-kit server-kx-neg-common.c \
 	p11-kit-trust-data/Example_Root_CA.pem data/test1.cat data/test2.cat \
 	data/test1.cat.data data/test2.cat.data data/test1.cat.out data/test2.cat.out \
-	data/pkcs7-cat-ca.pem data/long.crl data/long.pem
+	data/pkcs7-cat-ca.pem data/long.crl data/long.pem \
+	testpkcs11.pkcs15 testpkcs11.softhsm testpkcs11.sc-hsm testpkcs11-certs/ca.crt testpkcs11-certs/ca-tmpl \
+	testpkcs11-certs/client.key testpkcs11-certs/server.crt testpkcs11-certs/server-tmpl \
+	testpkcs11-certs/ca.key testpkcs11-certs/client.crt testpkcs11-certs/client-tmpl testpkcs11-certs/server.key
 
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = \
@@ -389,7 +392,7 @@ dist_check_SCRIPTS += fastopen.sh pkgconfig.sh starttls.sh starttls-ftp.sh start
 dist_check_SCRIPTS += gnutls-cli-self-signed.sh
 
 if ENABLE_PKCS11
-dist_check_SCRIPTS += p11-kit-trust.sh
+dist_check_SCRIPTS += p11-kit-trust.sh testpkcs11.sh certtool-pkcs11.sh
 
 if HAVE_PKCS11_TRUST_STORE
 if P11KIT_0_23_10_API
diff --git a/tests/suite/certtool-pkcs11.sh b/tests/certtool-pkcs11.sh
index 39933cd0c3..9a599e6146 100755
--- a/tests/suite/certtool-pkcs11.sh
+++ b/tests/certtool-pkcs11.sh
@@ -19,11 +19,11 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 srcdir="${srcdir:-.}"
-P11TOOL="${P11TOOL:-../../src/p11tool${EXEEXT}}"
-CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}"
+P11TOOL="${P11TOOL:-../src/p11tool${EXEEXT}}"
+CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}"
 DIFF="${DIFF:-diff -b -B}"
-SERV="${SERV:-../../src/gnutls-serv${EXEEXT}}"
-CLI="${CLI:-../../src/gnutls-cli${EXEEXT}}"
+SERV="${SERV:-../src/gnutls-serv${EXEEXT}}"
+CLI="${CLI:-../src/gnutls-cli${EXEEXT}}"
 RETCODE=0
 
 if ! test -x "${P11TOOL}"; then
@@ -56,7 +56,7 @@ fi
 P11TOOL="${VALGRIND} ${P11TOOL} --batch"
 SERV="${SERV} -q"
 
-. ${srcdir}/../scripts/common.sh
+. ${srcdir}/scripts/common.sh
 
 rm -f "${TMPFILE}"
 
@@ -130,7 +130,7 @@ generate_cert() {
 	url=$1
 
 	echo -n "* Generating a certificate... "
-	$CERTTOOL ${ADDITIONAL_PARAM} --generate-certificate --load-ca-certificate "$url" --load-ca-privkey "${srcdir}/pkcs11-certs/ca.key" --load-privkey "${srcdir}/pkcs11-certs/server.key" --template "${srcdir}/pkcs11-certs/server-tmpl" >>"${TMPFILE}" 2>&1
+	$CERTTOOL ${ADDITIONAL_PARAM} --generate-certificate --load-ca-certificate "$url" --load-ca-privkey "${srcdir}/testpkcs11-certs/ca.key" --load-privkey "${srcdir}/testpkcs11-certs/server.key" --template "${srcdir}/testpkcs11-certs/server-tmpl" >>"${TMPFILE}" 2>&1
 	if test $? = 0; then
 		echo ok
 	else
@@ -144,7 +144,7 @@ generate_cert_with_key() {
 	ca_key_url=$2
 
 	echo -n "* Generating a certificate (privkey in pkcs11)... "
-	$CERTTOOL ${ADDITIONAL_PARAM} --generate-certificate --load-ca-certificate "${ca_url}" --load-ca-privkey "${ca_key_url}" --load-privkey "${srcdir}/pkcs11-certs/server.key" --template "${srcdir}/pkcs11-certs/server-tmpl" >>"${TMPFILE}" 2>&1
+	$CERTTOOL ${ADDITIONAL_PARAM} --generate-certificate --load-ca-certificate "${ca_url}" --load-ca-privkey "${ca_key_url}" --load-privkey "${srcdir}/testpkcs11-certs/server.key" --template "${srcdir}/testpkcs11-certs/server-tmpl" >>"${TMPFILE}" 2>&1
 	if test $? = 0; then
 		echo ok
 	else
@@ -175,13 +175,13 @@ if test "x${TOKEN}" = x; then
 	exit_error
 fi
 
-write_ca_cert "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/pkcs11-certs/ca.crt" "CA"
+write_ca_cert "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/ca.crt" "CA"
 
-verify_certificate_test "${TOKEN};object=CA;object-type=cert" "${srcdir}/pkcs11-certs/server.crt"
-verify_certificate_test "${TOKEN};object=CA;object-type=cert" "${srcdir}/pkcs11-certs/client.crt"
+verify_certificate_test "${TOKEN};object=CA;object-type=cert" "${srcdir}/testpkcs11-certs/server.crt"
+verify_certificate_test "${TOKEN};object=CA;object-type=cert" "${srcdir}/testpkcs11-certs/client.crt"
 generate_cert "${TOKEN};object=CA;object-type=cert"
 
-write_ca_privkey "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/pkcs11-certs/ca.key"
+write_ca_privkey "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/ca.key"
 
 generate_cert_with_key "${TOKEN};object=CA;object-type=cert" "${TOKEN};object=CA-key;object-type=private"
 
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index 6e784fff8e..4b39da6f0f 100644
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -85,17 +85,12 @@ nodist_libecore_la_SOURCES = ecore/src/lib/ecore_anim.c			\
 	ecore/src/lib/eina_ustringshare.c ecore/src/lib/eina_value.c
 
 
-EXTRA_DIST += testcompat-main-polarssl testcompat-main-openssl testcompat-common \
-	testpkcs11.pkcs15 testpkcs11.softhsm testpkcs11.sc-hsm
+EXTRA_DIST += testcompat-main-polarssl testcompat-main-openssl testcompat-common
 nodist_check_SCRIPTS = chain.sh invalid-cert.sh \
 	testrng.sh testcompat-polarssl.sh testcompat-openssl.sh \
-	testrandom.sh certtool-pkcs11.sh tls-fuzzer/tls-fuzzer-nocert.sh \
+	testrandom.sh tls-fuzzer/tls-fuzzer-nocert.sh \
 	tls-fuzzer/tls-fuzzer-cert.sh tls-fuzzer/tls-fuzzer-alpn.sh
 
-if ENABLE_PKCS11
-nodist_check_SCRIPTS += testpkcs11.sh
-endif
-
 TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
 	LC_ALL="C"			\
 	VALGRIND="$(VALGRIND)"		\
diff --git a/tests/suite/pkcs11-certs/ca-tmpl b/tests/testpkcs11-certs/ca-tmpl
index 5bf462d1ef..5bf462d1ef 100644
--- a/tests/suite/pkcs11-certs/ca-tmpl
+++ b/tests/testpkcs11-certs/ca-tmpl
diff --git a/tests/suite/pkcs11-certs/ca.crt b/tests/testpkcs11-certs/ca.crt
index e39ee41f7a..e39ee41f7a 100644
--- a/tests/suite/pkcs11-certs/ca.crt
+++ b/tests/testpkcs11-certs/ca.crt
diff --git a/tests/suite/pkcs11-certs/ca.key b/tests/testpkcs11-certs/ca.key
index 62f5bfae39..62f5bfae39 100644
--- a/tests/suite/pkcs11-certs/ca.key
+++ b/tests/testpkcs11-certs/ca.key
diff --git a/tests/suite/pkcs11-certs/client-tmpl b/tests/testpkcs11-certs/client-tmpl
index a22eef84ba..a22eef84ba 100644
--- a/tests/suite/pkcs11-certs/client-tmpl
+++ b/tests/testpkcs11-certs/client-tmpl
diff --git a/tests/suite/pkcs11-certs/client.crt b/tests/testpkcs11-certs/client.crt
index 6f75590d25..6f75590d25 100644
--- a/tests/suite/pkcs11-certs/client.crt
+++ b/tests/testpkcs11-certs/client.crt
diff --git a/tests/suite/pkcs11-certs/client.key b/tests/testpkcs11-certs/client.key
index 9277bdfd8f..9277bdfd8f 100644
--- a/tests/suite/pkcs11-certs/client.key
+++ b/tests/testpkcs11-certs/client.key
diff --git a/tests/suite/pkcs11-certs/server-tmpl b/tests/testpkcs11-certs/server-tmpl
index 23103b4a91..23103b4a91 100644
--- a/tests/suite/pkcs11-certs/server-tmpl
+++ b/tests/testpkcs11-certs/server-tmpl
diff --git a/tests/suite/pkcs11-certs/server.crt b/tests/testpkcs11-certs/server.crt
index 694a0101f7..694a0101f7 100644
--- a/tests/suite/pkcs11-certs/server.crt
+++ b/tests/testpkcs11-certs/server.crt
diff --git a/tests/suite/pkcs11-certs/server.key b/tests/testpkcs11-certs/server.key
index 56e48735a0..56e48735a0 100644
--- a/tests/suite/pkcs11-certs/server.key
+++ b/tests/testpkcs11-certs/server.key
diff --git a/tests/suite/testpkcs11.pkcs15 b/tests/testpkcs11.pkcs15
index 565282a312..565282a312 100644
--- a/tests/suite/testpkcs11.pkcs15
+++ b/tests/testpkcs11.pkcs15
diff --git a/tests/suite/testpkcs11.sc-hsm b/tests/testpkcs11.sc-hsm
index f3eab685fb..f3eab685fb 100644
--- a/tests/suite/testpkcs11.sc-hsm
+++ b/tests/testpkcs11.sc-hsm
diff --git a/tests/suite/testpkcs11.sh b/tests/testpkcs11.sh
index 672ae791db..e8cdcd30dc 100755
--- a/tests/suite/testpkcs11.sh
+++ b/tests/testpkcs11.sh
@@ -19,11 +19,11 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 srcdir="${srcdir:-.}"
-P11TOOL="${P11TOOL:-../../src/p11tool${EXEEXT}}"
-CERTTOOL="${CERTTOOL:-../../src/certtool${EXEEXT}}"
+P11TOOL="${P11TOOL:-../src/p11tool${EXEEXT}}"
+CERTTOOL="${CERTTOOL:-../src/certtool${EXEEXT}}"
 DIFF="${DIFF:-diff -b -B}"
-SERV="${SERV:-../../src/gnutls-serv${EXEEXT}}"
-CLI="${CLI:-../../src/gnutls-cli${EXEEXT}}"
+SERV="${SERV:-../src/gnutls-serv${EXEEXT}}"
+CLI="${CLI:-../src/gnutls-cli${EXEEXT}}"
 RETCODE=0
 
 if test "${GNUTLS_FORCE_FIPS_MODE}" = 1;then
@@ -51,17 +51,20 @@ if ! test -z "${VALGRIND}"; then
 	VALGRIND="${LIBTOOL:-libtool} --mode=execute valgrind --leak-check=full"
 fi
 
-TMPFILE="testpkcs11.debug"
+TMPFILE="testpkcs11.debug.log"
 CERTTOOL_PARAM="--stdout-info"
 
 if test "${WINDIR}" != ""; then
 	exit 77
 fi 
 
+ASAN_OPTIONS="detect_leaks=0"
+export ASAN_OPTIONS
+
 P11TOOL="${VALGRIND} ${P11TOOL} --batch"
 SERV="${SERV} -q"
 
-. ${srcdir}/../scripts/common.sh
+. ${srcdir}/scripts/common.sh
 
 rm -f "${TMPFILE}"
 
@@ -76,7 +79,7 @@ exit_error () {
 # $1: token
 # $2: PIN
 # $3: filename
-# ${srcdir}/pkcs11-certs/client.key
+# ${srcdir}/testpkcs11-certs/client.key
 write_privkey () {
 	export GNUTLS_PIN="$2"
 	filename="$3"
@@ -454,8 +457,8 @@ import_temp_dsa_privkey () {
 
 # $1: token
 # $2: PIN
-# $3: cakey: ${srcdir}/pkcs11-certs/ca.key
-# $4: cacert: ${srcdir}/pkcs11-certs/ca.crt
+# $3: cakey: ${srcdir}/testpkcs11-certs/ca.key
+# $4: cacert: ${srcdir}/testpkcs11-certs/ca.crt
 #
 # Tests writing a certificate which corresponds to the given key,
 # as well as the CA certificate, and tries to export them.
@@ -468,7 +471,7 @@ write_certificate_test () {
 
 	echo -n "* Generating client certificate... "
 	"${CERTTOOL}" ${CERTTOOL_PARAM} ${ADDITIONAL_PARAM}  --generate-certificate --load-ca-privkey "${cakey}"  --load-ca-certificate "${cacert}"  \
-	--template ${srcdir}/pkcs11-certs/client-tmpl --load-privkey "${token};object=gnutls-client;object-type=private" \
+	--template ${srcdir}/testpkcs11-certs/client-tmpl --load-privkey "${token};object=gnutls-client;object-type=private" \
 	--load-pubkey "$pubkey" --outfile tmp-client.crt >>"${TMPFILE}" 2>&1
 
 	if test $? = 0; then
@@ -551,7 +554,7 @@ write_certificate_test () {
 
 	echo -n "* Trying to obtain back the cert... "
 	${P11TOOL} ${ADDITIONAL_PARAM} --export "${token};object=gnutls-ca;object-type=cert" --outfile crt1.tmp >>"${TMPFILE}" 2>&1
-	${DIFF} crt1.tmp "${srcdir}/pkcs11-certs/ca.crt"
+	${DIFF} crt1.tmp "${srcdir}/testpkcs11-certs/ca.crt"
 	if test $? != 0; then
 		echo "failed. Exported certificate differs (crt1.tmp)!"
 		exit_error
@@ -567,7 +570,7 @@ write_certificate_test () {
 	echo -n "* Trying to obtain the full chain... "
 	${P11TOOL} ${ADDITIONAL_PARAM} --login --export-chain "${token};object=gnutls-client;object-type=cert"|"${CERTTOOL}" ${CERTTOOL_PARAM}  -i --outfile crt1.tmp >>"${TMPFILE}" 2>&1
 
-	cat tmp-client.crt ${srcdir}/pkcs11-certs/ca.crt|"${CERTTOOL}" ${CERTTOOL_PARAM}  -i >crt2.tmp
+	cat tmp-client.crt ${srcdir}/testpkcs11-certs/ca.crt|"${CERTTOOL}" ${CERTTOOL_PARAM}  -i >crt2.tmp
 	${DIFF} crt1.tmp crt2.tmp
 	if test $? != 0; then
 		echo "failed. Exported certificate chain differs!"
@@ -584,8 +587,8 @@ write_certificate_test () {
 
 # $1: token
 # $2: PIN
-# $3: cakey: ${srcdir}/pkcs11-certs/ca.key
-# $4: cacert: ${srcdir}/pkcs11-certs/ca.crt
+# $3: cakey: ${srcdir}/testpkcs11-certs/ca.key
+# $4: cacert: ${srcdir}/testpkcs11-certs/ca.crt
 #
 # Tests writing a certificate which corresponds to the given key,
 # and verifies whether the ID is the same. Should utilize the
@@ -607,7 +610,7 @@ write_certificate_id_test_rsa () {
 
 	echo -n "* Checking whether right ID is set on copy... "
 	"${CERTTOOL}" ${CERTTOOL_PARAM} ${ADDITIONAL_PARAM}  --generate-certificate --load-ca-privkey "${cakey}"  --load-ca-certificate "${cacert}"  \
-	--template ${srcdir}/pkcs11-certs/client-tmpl --load-privkey "${token};object=xxx1-rsa;object-type=private" \
+	--template ${srcdir}/testpkcs11-certs/client-tmpl --load-privkey "${token};object=xxx1-rsa;object-type=private" \
 	--outfile tmp-client.crt >>"${TMPFILE}" 2>&1
 
 	if test $? != 0; then
@@ -632,8 +635,8 @@ write_certificate_id_test_rsa () {
 
 # $1: token
 # $2: PIN
-# $3: cakey: ${srcdir}/pkcs11-certs/ca.key
-# $4: cacert: ${srcdir}/pkcs11-certs/ca.crt
+# $3: cakey: ${srcdir}/testpkcs11-certs/ca.key
+# $4: cacert: ${srcdir}/testpkcs11-certs/ca.crt
 #
 # Tests writing a certificate which corresponds to the given key,
 # and verifies whether the ID is the same. Should utilize the
@@ -656,7 +659,7 @@ write_certificate_id_test_rsa2 () {
 
 	echo -n "* Checking whether right ID is set on copy... "
 	"${CERTTOOL}" ${CERTTOOL_PARAM} ${ADDITIONAL_PARAM}  --generate-certificate --load-ca-privkey "${cakey}"  --load-ca-certificate "${cacert}"  \
-	--template ${srcdir}/pkcs11-certs/client-tmpl --load-privkey ${tmpkey} \
+	--template ${srcdir}/testpkcs11-certs/client-tmpl --load-privkey ${tmpkey} \
 	--outfile tmp-client.crt >>"${TMPFILE}" 2>&1
 
 	if test $? != 0; then
@@ -689,8 +692,8 @@ write_certificate_id_test_rsa2 () {
 
 # $1: token
 # $2: PIN
-# $3: cakey: ${srcdir}/pkcs11-certs/ca.key
-# $4: cacert: ${srcdir}/pkcs11-certs/ca.crt
+# $3: cakey: ${srcdir}/testpkcs11-certs/ca.key
+# $4: cacert: ${srcdir}/testpkcs11-certs/ca.crt
 #
 # Tests writing a certificate which corresponds to the given key,
 # and verifies whether the ID is the same. Should utilize the
@@ -713,7 +716,7 @@ write_certificate_id_test_ecdsa () {
 
 	echo -n "* Checking whether right ID is set on copy... "
 	"${CERTTOOL}" ${CERTTOOL_PARAM} ${ADDITIONAL_PARAM}  --generate-certificate --load-ca-privkey "${cakey}"  --load-ca-certificate "${cacert}"  \
-	--template ${srcdir}/pkcs11-certs/client-tmpl --load-privkey ${tmpkey} \
+	--template ${srcdir}/testpkcs11-certs/client-tmpl --load-privkey ${tmpkey} \
 	--outfile tmp-client.crt >>"${TMPFILE}" 2>&1
 
 	if test $? != 0; then
@@ -857,7 +860,7 @@ if test -z "${type}"; then
 		echo ""
 		type=softhsm
 	else
-		exit 1
+		exit 77
 	fi
 
 fi
@@ -879,7 +882,7 @@ if test "x${TOKEN}" = x; then
 fi
 
 #write a given privkey
-write_privkey "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/pkcs11-certs/client.key"
+write_privkey "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/client.key"
 
 generate_temp_ecc_privkey "${TOKEN}" "${GNUTLS_PIN}" 256
 delete_temp_privkey "${TOKEN}" "${GNUTLS_PIN}" ecc-256
@@ -908,20 +911,20 @@ change_id_of_privkey "${TOKEN}" "${GNUTLS_PIN}"
 export_pubkey_of_privkey "${TOKEN}" "${GNUTLS_PIN}"
 change_label_of_privkey "${TOKEN}" "${GNUTLS_PIN}"
 
-write_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/pkcs11-certs/ca.key" "${srcdir}/pkcs11-certs/ca.crt" tmp-client.pub
-write_serv_privkey "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/pkcs11-certs/server.key"
-write_serv_cert "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/pkcs11-certs/server.crt"
+write_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/ca.key" "${srcdir}/testpkcs11-certs/ca.crt" tmp-client.pub
+write_serv_privkey "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/server.key"
+write_serv_cert "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/server.crt"
 
-write_serv_pubkey "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/pkcs11-certs/server.crt"
+write_serv_pubkey "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/server.crt"
 test_sign "${TOKEN}" "${GNUTLS_PIN}"
 
-use_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${TOKEN};object=serv-cert;object-type=cert" "${TOKEN};object=serv-key;object-type=private" "${srcdir}/pkcs11-certs/ca.crt" "full URLs"
+use_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${TOKEN};object=serv-cert;object-type=cert" "${TOKEN};object=serv-key;object-type=private" "${srcdir}/testpkcs11-certs/ca.crt" "full URLs"
 
-use_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${TOKEN};object=serv-cert" "${TOKEN};object=serv-key" "${srcdir}/pkcs11-certs/ca.crt" "abbrv URLs"
+use_certificate_test "${TOKEN}" "${GNUTLS_PIN}" "${TOKEN};object=serv-cert" "${TOKEN};object=serv-key" "${srcdir}/testpkcs11-certs/ca.crt" "abbrv URLs"
 
-write_certificate_id_test_rsa "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/pkcs11-certs/ca.key" "${srcdir}/pkcs11-certs/ca.crt"
-write_certificate_id_test_rsa2 "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/pkcs11-certs/ca.key" "${srcdir}/pkcs11-certs/ca.crt"
-write_certificate_id_test_ecdsa "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/pkcs11-certs/ca.key" "${srcdir}/pkcs11-certs/ca.crt"
+write_certificate_id_test_rsa "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/ca.key" "${srcdir}/testpkcs11-certs/ca.crt"
+write_certificate_id_test_rsa2 "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/ca.key" "${srcdir}/testpkcs11-certs/ca.crt"
+write_certificate_id_test_ecdsa "${TOKEN}" "${GNUTLS_PIN}" "${srcdir}/testpkcs11-certs/ca.key" "${srcdir}/testpkcs11-certs/ca.crt"
 
 test_delete_cert "${TOKEN}" "${GNUTLS_PIN}"
 
diff --git a/tests/suite/testpkcs11.softhsm b/tests/testpkcs11.softhsm
index d79a8528ec..d79a8528ec 100755
--- a/tests/suite/testpkcs11.softhsm
+++ b/tests/testpkcs11.softhsm