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

Signed-off-by: Zoltan Fridrich <[email protected]>
p11-glue · Sep 26, 2023 · 202c1c1 · 202c1c1
1 parent 2d697bf
commit 202c1c1
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/p11-kit/add-profile.c b/p11-kit/add-profile.c
@@ -108,7 +108,10 @@ 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 (rv == CKR_CANCEL)
+			p11_message (_("no matching token"));
+		else
+			p11_message (_("failed to find token: %s"), p11_kit_strerror (rv));
 		goto cleanup;
 	}
 

diff --git a/p11-kit/delete-object.c b/p11-kit/delete-object.c
@@ -90,7 +90,10 @@ 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 (rv == CKR_CANCEL)
+			p11_message (_("no matching object"));
+		else
+			p11_message (_("failed to find object: %s"), p11_kit_strerror (rv));
 		goto cleanup;
 	}
 

diff --git a/p11-kit/generate-keypair.c b/p11-kit/generate-keypair.c
@@ -292,7 +292,10 @@ 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 (rv == CKR_CANCEL)
+			p11_message (_("no matching token"));
+		else
+			p11_message (_("failed to find token: %s"), p11_kit_strerror (rv));
 		goto cleanup;
 	}