add list-readers action to tool
also refactor ykpiv_list_readers() a bit
This commit is contained in:
+1
-1
@@ -32,7 +32,7 @@ option "action" a "Action to take" values="version","generate","set-mgm-key",
|
||||
"reset","pin-retries","import-key","import-certificate","set-chuid",
|
||||
"request-certificate","verify-pin","change-pin","change-puk","unblock-pin",
|
||||
"selfsign-certificate","delete-certificate","read-certificate","status",
|
||||
"test-signature","test-decipher" enum multiple
|
||||
"test-signature","test-decipher","list-readers" enum multiple
|
||||
text "
|
||||
Multiple actions may be given at once and will be executed in order
|
||||
for example --action=verify-pin --action=request-certificate\n"
|
||||
|
||||
@@ -1569,6 +1569,21 @@ decipher_out:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static bool list_readers(ykpiv_state *state) {
|
||||
char readers[2048];
|
||||
char *reader_ptr;
|
||||
size_t len = sizeof(readers);
|
||||
ykpiv_rc rc = ykpiv_list_readers(state, readers, &len);
|
||||
if(rc != YKPIV_OK) {
|
||||
fprintf(stderr, "Failed listing readers.\n");
|
||||
return false;
|
||||
}
|
||||
for(reader_ptr = readers; *reader_ptr != '\0'; reader_ptr += strlen(reader_ptr) + 1) {
|
||||
printf("%s\n", reader_ptr);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
struct gengetopt_args_info args_info;
|
||||
ykpiv_state *state;
|
||||
@@ -1622,6 +1637,7 @@ int main(int argc, char *argv[]) {
|
||||
case action_arg_version:
|
||||
case action_arg_reset:
|
||||
case action_arg_status:
|
||||
case action_arg_listMINUS_readers:
|
||||
case action__NULL:
|
||||
default:
|
||||
continue;
|
||||
@@ -1666,6 +1682,7 @@ int main(int argc, char *argv[]) {
|
||||
case action_arg_status:
|
||||
case action_arg_testMINUS_signature:
|
||||
case action_arg_testMINUS_decipher:
|
||||
case action_arg_listMINUS_readers:
|
||||
case action__NULL:
|
||||
default:
|
||||
if(verbosity) {
|
||||
@@ -1850,6 +1867,11 @@ int main(int argc, char *argv[]) {
|
||||
ret = EXIT_FAILURE;
|
||||
}
|
||||
break;
|
||||
case action_arg_listMINUS_readers:
|
||||
if(list_readers(state) == false) {
|
||||
ret = EXIT_FAILURE;
|
||||
}
|
||||
break;
|
||||
case action__NULL:
|
||||
default:
|
||||
fprintf(stderr, "Wrong action. %d.\n", action);
|
||||
|
||||
Reference in New Issue
Block a user