From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Thu, 3 Jul 2014 09:45:39 +0000 (+0200)
Subject: testpkcs11: Try to write the trusted object both by so-pin and normal pin
X-Git-Tag: gnutls_3_3_6~65
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f305a57cf0c8bed4ee7c435a601bad2b305a841b;p=thirdparty%2Fgnutls.git

testpkcs11: Try to write the trusted object both by so-pin and normal pin
---

diff --git a/tests/suite/testpkcs11 b/tests/suite/testpkcs11
index c4a68d024e..f668240e4f 100755
--- a/tests/suite/testpkcs11
+++ b/tests/suite/testpkcs11
@@ -157,9 +157,14 @@ write_certificate_test () {
 	fi
 
 	echo -n "* Writing certificate of client's CA... "
-	$P11TOOL $ADDITIONAL_PARAM --so-login --ca --write --trusted --label gnutls-ca --load-certificate "$cacert" "$token" >>$TMPFILE 2>&1
+	$P11TOOL $ADDITIONAL_PARAM --login --ca --write --trusted --label gnutls-ca --load-certificate "$cacert" "$token" >>$TMPFILE 2>&1
+	ret=$?
+	if test $ret != 0;then
+		$P11TOOL $ADDITIONAL_PARAM --so-login --ca --write --trusted --label gnutls-ca --load-certificate "$cacert" "$token" >>$TMPFILE 2>&1
+		ret=$?
+	fi
 
-	if test $? = 0;then
+	if test $ret = 0;then
 		echo ok
 	else
 		echo failed