p11-kit tool: make "no matching object/token" error user friendly

Signed-off-by: Zoltan Fridrich <[email protected]>
p11-glue · Sep 22, 2023 · 921aa29 · 921aa29
1 parent e8872bf
commit 921aa29
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/p11-kit/add-profile.c b/p11-kit/add-profile.c
@@ -106,9 +106,8 @@ add_profile (const char *token_str,
 	}
 
 	p11_kit_iter_begin (iter, modules);
-	rv = p11_kit_iter_next (iter);
-	if (rv != CKR_OK) {
-		p11_message (_("failed to find the token: %s"), p11_kit_strerror (rv));
+	if (p11_kit_iter_next (iter) != CKR_OK) {
+		p11_message (_("no matching token"));
 		goto cleanup;
 	}
 

diff --git a/p11-kit/delete-object.c b/p11-kit/delete-object.c
@@ -88,9 +88,8 @@ delete_object (const char *token_str)
 	}
 
 	p11_kit_iter_begin (iter, modules);
-	rv = p11_kit_iter_next (iter);
-	if (rv != CKR_OK) {
-		p11_message (_("failed to find the object: %s"), p11_kit_strerror (rv));
+	if (p11_kit_iter_next (iter) != CKR_OK) {
+		p11_message (_("no matching object"));
 		goto cleanup;
 	}
 

diff --git a/p11-kit/generate-keypair.c b/p11-kit/generate-keypair.c
@@ -290,9 +290,8 @@ generate_keypair (const char *token_str,
 	}
 
 	p11_kit_iter_begin (iter, modules);
-	rv = p11_kit_iter_next (iter);
-	if (rv != CKR_OK) {
-		p11_message (_("failed to find the token: %s"), p11_kit_strerror (rv));
+	if (p11_kit_iter_next (iter) != CKR_OK) {
+		p11_message (_("no matching token"));
 		goto cleanup;
 	}