|
|
@ -6,7 +6,7 @@ |
|
|
|
|
|
|
|
--- a/scd/apdu.c
|
|
|
|
+++ b/scd/apdu.c
|
|
|
|
@@ -793,7 +793,7 @@ connect_pcsc_card (int slot)
|
|
|
|
@@ -816,7 +816,7 @@ connect_pcsc_card (int slot)
|
|
|
|
|
|
|
|
err = pcsc_connect (reader_table[slot].pcsc.context, |
|
|
|
reader_table[slot].rdrname, |
|
|
@ -22,28 +22,28 @@ |
|
|
|
oDisableApplication, |
|
|
|
oEnablePinpadVarlen, |
|
|
|
+ oSharedAccess,
|
|
|
|
oListenBacklog |
|
|
|
}; |
|
|
|
oListenBacklog, |
|
|
|
|
|
|
|
@@ -157,6 +158,8 @@ static ARGPARSE_OPTS opts[] = {
|
|
|
|
N_("use variable length input for pinpad")), |
|
|
|
ARGPARSE_s_s (oHomedir, "homedir", "@"), |
|
|
|
oNoop |
|
|
|
@@ -164,6 +165,8 @@ static ARGPARSE_OPTS opts[] = {
|
|
|
|
/* Stubs for options which are implemented by 2.3 or later. */ |
|
|
|
ARGPARSE_s_s (oNoop, "application-priority", "@"), |
|
|
|
|
|
|
|
+ ARGPARSE_s_n (oSharedAccess, "shared-access", N_("use PCSC_SHARE_SHARED for pcsc_connect")),
|
|
|
|
+
|
|
|
|
ARGPARSE_end () |
|
|
|
}; |
|
|
|
|
|
|
|
@@ -597,6 +598,8 @@ main (int argc, char **argv )
|
|
|
|
@@ -629,6 +632,8 @@ main (int argc, char **argv )
|
|
|
|
|
|
|
|
case oEnablePinpadVarlen: opt.enable_pinpad_varlen = 1; break; |
|
|
|
case oNoop: break; |
|
|
|
|
|
|
|
+ case oSharedAccess: opt.shared_access = 1; break;
|
|
|
|
+
|
|
|
|
default: |
|
|
|
pargs.err = configfp? ARGPARSE_PRINT_WARNING:ARGPARSE_PRINT_ERROR; |
|
|
|
break; |
|
|
|
@@ -695,6 +695,7 @@ main (int argc, char **argv )
|
|
|
|
@@ -727,6 +732,7 @@ main (int argc, char **argv )
|
|
|
|
es_printf ("disable-pinpad:%lu:\n", GC_OPT_FLAG_NONE ); |
|
|
|
es_printf ("card-timeout:%lu:%d:\n", GC_OPT_FLAG_DEFAULT, 0); |
|
|
|
es_printf ("enable-pinpad-varlen:%lu:\n", GC_OPT_FLAG_NONE ); |
|
|
@ -64,7 +64,7 @@ |
|
|
|
|
|
|
|
--- a/tools/gpgconf-comp.c
|
|
|
|
+++ b/tools/gpgconf-comp.c
|
|
|
|
@@ -648,6 +648,9 @@ static gc_option_t gc_options_scdaemon[] =
|
|
|
|
@@ -653,6 +653,9 @@ static gc_option_t gc_options_scdaemon[] =
|
|
|
|
{ "card-timeout", GC_OPT_FLAG_NONE|GC_OPT_FLAG_RUNTIME, GC_LEVEL_BASIC, |
|
|
|
"gnupg", "|N|disconnect the card after N seconds of inactivity", |
|
|
|
GC_ARG_TYPE_UINT32, GC_BACKEND_SCDAEMON }, |
|
|
|