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

piv-tool: make '--card-driver ?' list all available drivers 

Extend piv-tool the same way opensc-explorer was extended. I.e.
treat the question mark given as argument to option '--card-driver'
special: list all available drivers instead of stupidly bailing out.

In contrast to opensc-tool and opensc-explorer, which are card-agnostic,
I am not sure whether the option '--card-driver' makes sense on this
card-specific tool.
This commit is contained in:
Peter Marschall 2020-01-04 17:44:03 +01:00
parent 94288b438e
commit 30fdc7de4a
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/tools/piv-tool.1.xml
View File

@ -168,8 +168,13 @@
<option>--card-driver</option> <replaceable>driver</replaceable>,
<option>-c</option> <replaceable>driver</replaceable>
</term>
<listitem><para>Use the given card driver.
The default is auto-detected.</para></listitem>
<listitem><para>
Use the given card driver.
The default is to auto-detect the correct card driver.
The literal value <literal>?</literal> lists
all available card drivers and terminates
<command>piv-tool</command>.
</para></listitem>
</varlistentry>
<varlistentry>
<term>

16
src/tools/piv-tool.c
View File

@ -98,7 +98,7 @@ static const char *option_help[] = {
"Input file for cert",
"Sends an APDU in format AA:BB:CC:DD:EE:FF...",
"Uses reader number <arg> [0]",
"Forces the use of driver <arg> [auto-detect]",
"Forces the use of driver <arg> [auto-detect; '?' for list]",
"Wait for a card to be inserted",
"Verbose operation. Use several times to enable debug output.",
};
@ -478,6 +478,7 @@ int main(int argc, char *argv[])
int compress_cert = 0;
int do_print_serial = 0;
int do_print_name = 0;
int do_list_card_drivers = 0;
int action_count = 0;
const char *opt_driver = NULL;
const char *out_file = NULL;
@ -556,12 +557,20 @@ int main(int argc, char *argv[])
break;
case 'c':
opt_driver = optarg;
/* special card driver value "?" means: list available drivers */
if (opt_driver != NULL && strncmp("?", opt_driver, sizeof("?")) == 0) {
opt_driver = NULL;
do_list_card_drivers = 1;
action_count++;
}
break;
case 'w':
opt_wait = 1;
break;
}
}
if (action_count == 0)
util_print_usage_and_die(app_name, options, option_help, NULL);
@ -603,6 +612,11 @@ int main(int argc, char *argv[])
if (action_count <= 0)
goto end;
if (do_list_card_drivers) {
err = util_list_card_drivers(ctx);
goto end;
}
if (opt_driver != NULL) {
err = sc_set_card_driver(ctx, opt_driver);
if (err) {