mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* Makefile.am: Add OPENSC_LIBS to all programs.
* scdaemon.c, scdaemon.h: New option --disable-opensc. * card.c (card_open): Implement it. * apdu.c (open_osc_reader, osc_send_apdu): New. (apdu_open_reader) [HAVE_OPENSC]: Use the opensc driver if not disabled. (error_string) [HAVE_OPENSC]: Use sc_strerror. (send_apdu) [HAVE_OPENSC]: Call osc_apdu_send.
This commit is contained in:
parent
6bdd855d11
commit
0506e4ebec
9 changed files with 401 additions and 50 deletions
|
@ -70,6 +70,7 @@ enum cmd_and_opt_values
|
|||
oBatch,
|
||||
oReaderPort,
|
||||
octapiDriver,
|
||||
oDisableOpenSC,
|
||||
|
||||
aTest };
|
||||
|
||||
|
@ -94,6 +95,16 @@ static ARGPARSE_OPTS opts[] = {
|
|||
{ oLogFile, "log-file" ,2, N_("use a log file for the server")},
|
||||
{ oReaderPort, "reader-port", 2, N_("|N|connect to reader at port N")},
|
||||
{ octapiDriver, "ctapi-driver", 2, N_("NAME|use NAME as ctAPI driver")},
|
||||
{ oDisableOpenSC, "disable-opensc", 0,
|
||||
#ifdef HAVE_OPENSC
|
||||
N_("Do not use the OpenSC layer")
|
||||
#else
|
||||
"@"
|
||||
#endif
|
||||
/* end --disable-opensc */},
|
||||
|
||||
|
||||
|
||||
{0}
|
||||
};
|
||||
|
||||
|
@ -368,6 +379,7 @@ main (int argc, char **argv )
|
|||
|
||||
case oReaderPort: app_set_default_reader_port (pargs.r.ret_str); break;
|
||||
case octapiDriver: opt.ctapi_driver = pargs.r.ret_str; break;
|
||||
case oDisableOpenSC: opt.disable_opensc = 1; break;
|
||||
|
||||
default : pargs.err = configfp? 1:2; break;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue