From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Tue, 31 Mar 2015 06:48:37 +0000 (+0200)
Subject: tests: check whether PKCS #11 ID set on copy/generation is correct
X-Git-Tag: gnutls_3_4_0~64
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=20397ec2f74b9fca44d77d0b220ee285b864f70f;p=thirdparty%2Fgnutls.git

tests: check whether PKCS #11 ID set on copy/generation is correct
---

diff --git a/tests/suite/testpkcs11 b/tests/suite/testpkcs11
index eb8a53159a..2a4b88fee5 100755
--- a/tests/suite/testpkcs11
+++ b/tests/suite/testpkcs11
@@ -120,7 +120,7 @@ generate_rsa_privkey () {
 	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
+	$P11TOOL $ADDITIONAL_PARAM --login --id 000102030405 --label gnutls-client --generate-rsa --bits $bits "$token" --outfile tmp-client.pub >>$TMPFILE 2>&1
 	if test $? = 0;then
 		echo ok
 	else
@@ -218,7 +218,7 @@ change_id_of_privkey () {
 	token=$1
 
 	echo -n "* Change the CKA_ID of generated private key... "
-	$P11TOOL $ADDITIONAL_PARAM --login --set-id "01a1b103" "$token;object=gnutls-client;object-type=private" >>$TMPFILE 2>&1
+	$P11TOOL $ADDITIONAL_PARAM --login --set-id "01a1b103" "$token;object=gnutls-client;id=%00%01%02%03%04%05;object-type=private" >>$TMPFILE 2>&1
 	if test $? != 0;then
 		echo failed
 		exit_error
@@ -307,7 +307,7 @@ write_certificate_test () {
 	fi
 
 	echo -n "* Writing client certificate... "
-	$P11TOOL $ADDITIONAL_PARAM --login --write --label gnutls-client --load-certificate tmp-client.crt "$token" >>$TMPFILE 2>&1
+	$P11TOOL $ADDITIONAL_PARAM --login --write --id "01a1b103" --label gnutls-client --load-certificate tmp-client.crt "$token" >>$TMPFILE 2>&1
 	if test $? = 0;then
 		echo ok
 	else
@@ -315,6 +315,14 @@ write_certificate_test () {
 		exit_error
 	fi
 
+	echo -n "* Checking whether ID was correctly set... "
+	$P11TOOL $ADDITIONAL_PARAM --login --list-certs "$token;object=gnutls-client;object-type=private;id=%01%a1%b1%03" 2>&1 | grep 'ID: 01:a1:b1:03' >>$TMPFILE 2>&1
+	if test $? != 0;then
+		echo "ID was not set on copy"
+		exit_error
+	fi
+	echo ok
+
 	echo -n "* Writing certificate of client's CA... "
 	$P11TOOL $ADDITIONAL_PARAM --login --mark-trusted --mark-ca --write --label gnutls-ca --load-certificate "$cacert" "$token" >>$TMPFILE 2>&1
 	ret=$?