security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-09 12:54:23 +01:00
Code Activity

* g10.c, options.h: New option --limit-card-insert-tries.

Browse Source 
* cardglue.c (open_card): Use it.
This commit is contained in:
Werner Koch 2005-07-19 12:14:39 +00:00
parent 730247b19e
commit a0b4f40301
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/ChangeLog
View File

@ -1,5 +1,8 @@
2005-07-19 Werner Koch <wk@g10code.com> 2005-07-19 Werner Koch <wk@g10code.com>
* g10.c, options.h: New option --limit-card-insert-tries.
* cardglue.c (open_card): Use it.
* export.c (parse_export_options): New option * export.c (parse_export_options): New option
export-reset-subkey-passwd. export-reset-subkey-passwd.
(do_export_stream): Implement it. (do_export_stream): Implement it.

6
g10/cardglue.c
View File

@ -385,6 +385,7 @@ open_card (void)
int rc; int rc;
app_t app; app_t app;
int did_shutdown = 0; int did_shutdown = 0;
int retry_count = 0;
/* First check whether we can contact a gpg-agent and divert all /* First check whether we can contact a gpg-agent and divert all
operation to it. This is required because gpg as well as the operation to it. This is required because gpg as well as the
@ -421,7 +422,10 @@ open_card (void)
app = xcalloc (1, sizeof *app); app = xcalloc (1, sizeof *app);
app->slot = slot; app->slot = slot;
rc = app_select_openpgp (app); rc = app_select_openpgp (app);
if (rc && !opt.batch) if (opt.limit_card_insert_tries
&& ++retry_count >= opt.limit_card_insert_tries)
;
else if (rc && !opt.batch)
{ {
write_status_text (STATUS_CARDCTRL, "1"); write_status_text (STATUS_CARDCTRL, "1");

9
g10/g10.c
View File

@ -347,6 +347,7 @@ enum cmd_and_opt_values
oMultifile, oMultifile,
oKeyidFormat, oKeyidFormat,
oNoInteractiveSelection, oNoInteractiveSelection,
oLimitCardInsertTries,
oReaderPort, oReaderPort,
octapiDriver, octapiDriver,
@ -677,6 +678,7 @@ static ARGPARSE_OPTS opts[] = {
{ oMultifile, "multifile", 0, "@" }, { oMultifile, "multifile", 0, "@" },
{ oKeyidFormat, "keyid-format", 2, "@" }, { oKeyidFormat, "keyid-format", 2, "@" },
{ oNoInteractiveSelection, "no-interactive-selection", 0, "@" }, { oNoInteractiveSelection, "no-interactive-selection", 0, "@" },
{ oLimitCardInsertTries, "limit-card-insert-tries", 1, "@"},
{ oReaderPort, "reader-port", 2, "@"}, { oReaderPort, "reader-port", 2, "@"},
{ octapiDriver, "ctapi-driver", 2, "@"}, { octapiDriver, "ctapi-driver", 2, "@"},
@ -1583,7 +1585,7 @@ parse_trust_model(const char *model)
} }
int int
main( int argc, char **argv ) main (int argc, char **argv )
{ {
ARGPARSE_ARGS pargs; ARGPARSE_ARGS pargs;
IOBUF a; IOBUF a;
@ -2546,6 +2548,11 @@ main( int argc, char **argv )
case oNoInteractiveSelection: case oNoInteractiveSelection:
opt.no_interactive_selection = 1; opt.no_interactive_selection = 1;
break; break;
case oLimitCardInsertTries:
opt.limit_card_insert_tries = pargs.r.ret_int;
break;
case oNoop: break; case oNoop: break;

2
g10/options.h
View File

@ -195,6 +195,8 @@ struct
byte *show_subpackets; byte *show_subpackets;
int rfc2440_text; int rfc2440_text;
int limit_card_insert_tries; /* If > 0, limit the number of card
insertion prompts to this value. */
#ifdef ENABLE_CARD_SUPPORT #ifdef ENABLE_CARD_SUPPORT
const char *ctapi_driver; /* Library to access the ctAPI. */ const char *ctapi_driver; /* Library to access the ctAPI. */
const char *pcsc_driver; /* Library to access the PC/SC system. */ const char *pcsc_driver; /* Library to access the PC/SC system. */