From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Mon, 5 Jan 2015 14:01:22 +0000 (+0100)
Subject: testpkcs11: detect softhsm2
X-Git-Tag: gnutls_3_4_0~392
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=909dea5806c448e6c6a90d8ef2aa8a0634cbdba3;p=thirdparty%2Fgnutls.git

testpkcs11: detect softhsm2
---

diff --git a/tests/suite/testpkcs11 b/tests/suite/testpkcs11
index 3fe08041eb..c0a7b4634e 100755
--- a/tests/suite/testpkcs11
+++ b/tests/suite/testpkcs11
@@ -389,7 +389,7 @@ type=$1
 
 if test -z "$type";then
 	echo "usage: $0: [pkcs15|softhsm|sc-hsm]"
-	if test -x "/usr/bin/softhsm";then
+	if test -x "/usr/bin/softhsm" || test -x "/usr/bin/softhsm2-util";then
 		echo "assuming 'softhsm'"
 		echo ""
 		type=softhsm