summaryrefslogtreecommitdiff
path: root/tests/suite
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2014-07-03 11:45:39 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2014-07-03 11:55:54 +0200
commitf305a57cf0c8bed4ee7c435a601bad2b305a841b (patch)
treee778952ec85cf03c7235c9b46cc4248be622be78 /tests/suite
parent67ec25733c015109f098be5b5cc8258ff1b96bba (diff)
downloadgnutls-f305a57cf0c8bed4ee7c435a601bad2b305a841b.tar.gz
testpkcs11: Try to write the trusted object both by so-pin and normal pin
Diffstat (limited to 'tests/suite')
-rwxr-xr-xtests/suite/testpkcs119
1 files changed, 7 insertions, 2 deletions
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