Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

opensc: fix help output of openpgp-tool

Browse source 
A comma sign was left-out when re-basing the GnuK patch on top of opensc.
Also order options more intuitively, put --do last.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle 2014-12-13 03:40:24 +01:00
parent be72d3b10c
commit 678fc8edc6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
utils/opensc/patches/0006-openpgp-tool-Support-deleting-key-in-Gnuk.patch
View file

@ -28,22 +28,22 @@ index de1c9d4..374819a 100644
static const char *app_name = "openpgp-tool"; static const char *app_name = "openpgp-tool";
@@ -99,6 +101,7 @@ static const struct option options[] = { @@ -98,6 +100,7 @@ static const struct option options[] = {
{ "erase", no_argument, NULL, 'E' },
{ "verify", required_argument, NULL, OPT_VERIFY }, { "verify", required_argument, NULL, OPT_VERIFY },
{ "pin", required_argument, NULL, OPT_PIN }, { "pin", required_argument, NULL, OPT_PIN },
{ "do", required_argument, NULL, 'd' },
+ { "del-key", required_argument, NULL, OPT_DELKEY }, + { "del-key", required_argument, NULL, OPT_DELKEY },
{ "do", required_argument, NULL, 'd' },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
@@ -118,6 +121,7 @@ static const char *option_help[] = {
@@ -119,6 +122,7 @@ static const char *option_help[] = { /* E */ "Erase (reset) the card",
"Verify PIN (CHV1, CHV2, CHV3...)", "Verify PIN (CHV1, CHV2, CHV3...)",
"PIN string", "PIN string",
+ "Delete key (1, 2, 3 or all)",
/* d */ "Dump private data object number <arg> (i.e. PRIVATE-DO-<arg>)" /* d */ "Dump private data object number <arg> (i.e. PRIVATE-DO-<arg>)"
+ "Delete key (1, 2, 3 or all)"
}; };
static const struct ef_name_map openpgp_data[] = {
@@ -302,6 +306,14 @@ static int decode_options(int argc, char **argv) @@ -302,6 +306,14 @@ static int decode_options(int argc, char **argv)
case 'E': case 'E':
opt_erase++; opt_erase++;