security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

scd: Bring back --card-timeout option as deprecated.

Browse Source 
* doc/scdaemon.texi (card-timeout): Add.
* scd/scdaemon.c (main): Revert the change.

--

GnuPG-bug-id: 3383
Fixes-commit: 4262933ef6f7530b4ad55646250a6763de9bf103
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2019-06-06 09:55:10 +09:00
parent c13e459ffe
commit 72fe8d652f
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/scdaemon.texi
View File

@ -286,6 +286,12 @@ To get a list of available CCID readers you may use this command:
@end smallexample @end smallexample
@end cartouche @end cartouche
@item --card-timeout @var{n}
@opindex card-timeout
This option is deprecated. In GnuPG 2.0, it used to be used for
DISCONNECT command to control timing issue. Since DISCONNECT command
works synchronously, it has no effect.
@item --enable-pinpad-varlen @item --enable-pinpad-varlen
@opindex enable-pinpad-varlen @opindex enable-pinpad-varlen
Please specify this option when the card reader supports variable Please specify this option when the card reader supports variable

5
scd/scdaemon.c
View File

@ -89,6 +89,7 @@ enum cmd_and_opt_values
oDaemon, oDaemon,
oBatch, oBatch,
oReaderPort, oReaderPort,
oCardTimeout,
octapiDriver, octapiDriver,
opcscDriver, opcscDriver,
oDisableCCID, oDisableCCID,
@ -143,6 +144,8 @@ static ARGPARSE_OPTS opts[] = {
"@" "@"
#endif #endif
/* end --disable-ccid */), /* end --disable-ccid */),
ARGPARSE_s_u (oCardTimeout, "card-timeout",
N_("|N|disconnect the card after N seconds of inactivity")),
ARGPARSE_s_n (oDisablePinpad, "disable-pinpad", ARGPARSE_s_n (oDisablePinpad, "disable-pinpad",
N_("do not use a reader's pinpad")), N_("do not use a reader's pinpad")),
@ -611,6 +614,8 @@ main (int argc, char **argv )
break; break;
case oDenyAdmin: opt.allow_admin = 0; break; case oDenyAdmin: opt.allow_admin = 0; break;
case oCardTimeout: opt.card_timeout = pargs.r.ret_ulong; break;
case oDisableApplication: case oDisableApplication:
add_to_strlist (&opt.disabled_applications, pargs.r.ret_str); add_to_strlist (&opt.disabled_applications, pargs.r.ret_str);
break; break;