giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pkcs11-tool: do --test even without a slot, at least hotplug. print a proper error name for C_GetSlotInfo 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4750 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
martin 2010-09-21 16:11:44 +00:00
parent 528b7ae7c7
commit 01931d6794
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/tools/pkcs11-tool.c
View File

@ -531,6 +531,9 @@ int main(int argc, char * argv[])
list_slots(list_token_slots, 1, do_list_slots);
if (do_test)
p11_test(opt_slot, session);
if (p11_num_slots == 0) {
fprintf(stderr, "No slots.\n");
err = 1;
@ -674,8 +677,6 @@ int main(int argc, char * argv[])
set_id_attr(opt_slot, session);
}
if (do_test)
p11_test(opt_slot, session);
if (do_test_kpgen_certwrite)
test_kpgen_certwrite(opt_slot, session);
@ -743,7 +744,7 @@ static void list_slots(int tokens, int refresh, int print)
printf("Slot %lu (0x%lx): ", n, p11_slots[n]);
rv = p11->C_GetSlotInfo(p11_slots[n], &info);
if (rv != CKR_OK) {
printf("(GetSlotInfo failed, error 0x%lx)\n", rv);
printf("(GetSlotInfo failed, %s)\n", CKR2Str(rv));
continue;
}
printf("%s\n", p11_utf8_to_local(info.slotDescription,