[pkg-opensc-commit] [pkcs11-helper] 131/253: typos

[Eric Dorland]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository pkcs11-helper.

commit a1ea99cb8805dce8446a561630a849f6aef713c2
Author: Alon Bar-Lev <alon.barlev at gmail.com>
Date:   Tue Oct 23 07:09:27 2007 +0000

    typos
---
 tests/test-basic/test-basic.c             |  2 +-
 tests/test-certificate/test-certificate.c |  2 +-
 tests/test-slotevent/test-slotevent.c     | 18 ++++++++----------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/tests/test-basic/test-basic.c b/tests/test-basic/test-basic.c
index 4af909b..bda479b 100644
--- a/tests/test-basic/test-basic.c
+++ b/tests/test-basic/test-basic.c
@@ -55,7 +55,7 @@ int main () {
 			FALSE
 		)) != CKR_OK
 	) {
-		fatal ("pkcs11h_terminate failed", rv);
+		fatal ("pkcs11h_addProvider failed", rv);
 	}
 
 	printf ("Terminating pkcs11-helper\n");
diff --git a/tests/test-certificate/test-certificate.c b/tests/test-certificate/test-certificate.c
index 4a3c28e..67a0ec4 100644
--- a/tests/test-certificate/test-certificate.c
+++ b/tests/test-certificate/test-certificate.c
@@ -201,7 +201,7 @@ int main () {
 			FALSE
 		)) != CKR_OK
 	) {
-		fatal ("pkcs11h_terminate failed", rv);
+		fatal ("pkcs11h_addProvider failed", rv);
 	}
 
 	mypause ("Please remove all tokens, press <Enter>: ");
diff --git a/tests/test-slotevent/test-slotevent.c b/tests/test-slotevent/test-slotevent.c
index b2b929a..4e8fff7 100644
--- a/tests/test-slotevent/test-slotevent.c
+++ b/tests/test-slotevent/test-slotevent.c
@@ -89,7 +89,7 @@ int main () {
 			FALSE
 		)) != CKR_OK
 	) {
-		fatal ("pkcs11h_terminate failed", rv);
+		fatal ("pkcs11h_addProvider failed", rv);
 	}
 
 	printf ("Please remove and insert tokens (pause for 30 seconds)\n");
@@ -117,7 +117,7 @@ int main () {
 			FALSE
 		)) != CKR_OK
 	) {
-		fatal ("pkcs11h_terminate failed", rv);
+		fatal ("pkcs11h_addProvider failed", rv);
 	}
 
 	printf ("Please remove and insert tokens (pause for 30 seconds)\n");
@@ -145,7 +145,7 @@ int main () {
 			FALSE
 		)) != CKR_OK
 	) {
-		fatal ("pkcs11h_terminate failed", rv);
+		fatal ("pkcs11h_addProvider failed", rv);
 	}
 
 	printf ("Please remove and insert tokens (pause for 30 seconds)\n");
@@ -156,6 +156,10 @@ int main () {
 	sleep (30);
 #endif
 
+	if ((rv = pkcs11h_removeProvider (TEST_PROVIDER)) != CKR_OK) {
+		fatal ("pkcs11h_removeProvider failed", rv);
+	}
+
 	printf ("Adding provider '%s' as fetch\n", TEST_PROVIDER);
 
 	if (
@@ -169,7 +173,7 @@ int main () {
 			FALSE
 		)) != CKR_OK
 	) {
-		fatal ("pkcs11h_terminate failed", rv);
+		fatal ("pkcs11h_addProvider failed", rv);
 	}
 
 	printf ("Please remove and insert tokens (pause for 30 seconds)\n");
@@ -186,12 +190,6 @@ int main () {
 		fatal ("pkcs11h_terminate failed", rv);
 	}
 
-	printf ("Terminating pkcs11-helper\n");
-
-	if ((rv = pkcs11h_terminate ()) != CKR_OK) {
-		fatal ("pkcs11h_terminate failed", rv);
-	}
-
 	exit (0);
 	return 0;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opensc/pkcs11-helper.git