From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Wed, 2 Jul 2014 21:14:28 +0000 (+0200)
Subject: tests: testpkcs11: temp parameters are deleted after generation
X-Git-Tag: gnutls_3_3_6~66
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=67ec25733c015109f098be5b5cc8258ff1b96bba;p=thirdparty%2Fgnutls.git

tests: testpkcs11: temp parameters are deleted after generation
---

diff --git a/tests/suite/testpkcs11 b/tests/suite/testpkcs11
index c71f3e9386..c4a68d024e 100755
--- a/tests/suite/testpkcs11
+++ b/tests/suite/testpkcs11
@@ -77,6 +77,25 @@ generate_rsa_privkey () {
 	$P11TOOL $ADDITIONAL_PARAM --login --label gnutls-client --generate-rsa --bits $bits "$token" --outfile tmp-client.pub >>$TMPFILE 2>&1
 	if test $? = 0;then
 		echo ok
+	else
+		echo failed
+		exit 1
+	fi
+}
+
+# $1: token
+# $2: PIN
+# $3: bits
+generate_temp_rsa_privkey () {
+	export GNUTLS_PIN=$2
+	token=$1
+	bits=$3
+
+	echo -n "* Generating RSA private key ($bits)... "
+	$P11TOOL $ADDITIONAL_PARAM --login --label gnutls-client --generate-rsa --bits $bits "$token" --outfile tmp-client.pub >>$TMPFILE 2>&1
+	if test $? = 0;then
+		$P11TOOL $ADDITIONAL_PARAM --login --delete "$token;object=gnutls-client;object-type=private" >>$TMPFILE 2>&1
+		echo ok
 	else
 		echo failed
 		RETCODE=1
@@ -86,7 +105,7 @@ generate_rsa_privkey () {
 # $1: token
 # $2: PIN
 # $3: bits
-generate_ecc_privkey () {
+generate_temp_ecc_privkey () {
 	export GNUTLS_PIN=$2
 	token=$1
 	bits=$3
@@ -94,6 +113,7 @@ generate_ecc_privkey () {
 	echo -n "* Generating ECC private key ($bits)... "
 	$P11TOOL $ADDITIONAL_PARAM --login --label gnutls-client --generate-ecc --bits $bits "$token" --outfile tmp-client.pub >>$TMPFILE 2>&1
 	if test $? = 0;then
+		$P11TOOL $ADDITIONAL_PARAM --login --delete "$token;object=gnutls-client;object-type=private" >>$TMPFILE 2>&1
 		echo ok
 	else
 		echo failed
@@ -261,11 +281,11 @@ fi
 #write a given privkey
 write_privkey $TOKEN $GNUTLS_PIN "$srcdir/pkcs11-certs/client.key"
 
-generate_ecc_privkey $TOKEN $GNUTLS_PIN 256
+generate_temp_ecc_privkey $TOKEN $GNUTLS_PIN 256
 
-generate_ecc_privkey $TOKEN $GNUTLS_PIN 384
+generate_temp_ecc_privkey $TOKEN $GNUTLS_PIN 384
 
-generate_rsa_privkey $TOKEN $GNUTLS_PIN 2048
+#generate_temp_rsa_privkey $TOKEN $GNUTLS_PIN 2048
 
 generate_rsa_privkey $TOKEN $GNUTLS_PIN 1024