mirror of git://git.gnupg.org/gnupg.git
Print warning for missing pcsc-wrapper
This commit is contained in:
parent
6a13cf2c3d
commit
496c3b5572
|
@ -1,3 +1,8 @@
|
||||||
|
2005-12-06 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
|
* apdu.c (open_pcsc_reader): Check that pcsc-wrapper is actually
|
||||||
|
installed.
|
||||||
|
|
||||||
2005-11-23 Werner Koch <wk@g10code.com>
|
2005-11-23 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
* app-nks.c (verify_pin): Give a special error message for a Nullpin.
|
* app-nks.c (verify_pin): Give a special error message for a Nullpin.
|
||||||
|
|
10
scd/apdu.c
10
scd/apdu.c
|
@ -1328,6 +1328,14 @@ open_pcsc_reader (const char *portstr)
|
||||||
int err;
|
int err;
|
||||||
unsigned int dummy_status;
|
unsigned int dummy_status;
|
||||||
int sw = SW_HOST_CARD_IO_ERROR;
|
int sw = SW_HOST_CARD_IO_ERROR;
|
||||||
|
const char *wrapperpgm = GNUPG_LIBDIR "/pcsc-wrapper";
|
||||||
|
|
||||||
|
if (access (wrapperpgm, X_OK))
|
||||||
|
{
|
||||||
|
log_error ("can't run PC/SC access module `%s': %s\n",
|
||||||
|
wrapperpgm, strerror (errno));
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
slot = new_reader_slot ();
|
slot = new_reader_slot ();
|
||||||
if (slot == -1)
|
if (slot == -1)
|
||||||
|
@ -1400,7 +1408,7 @@ open_pcsc_reader (const char *portstr)
|
||||||
close(i);
|
close(i);
|
||||||
errno = 0;
|
errno = 0;
|
||||||
|
|
||||||
execl (GNUPG_LIBDIR "/pcsc-wrapper",
|
execl (wrapperpgm,
|
||||||
"pcsc-wrapper",
|
"pcsc-wrapper",
|
||||||
"--",
|
"--",
|
||||||
"1", /* API version */
|
"1", /* API version */
|
||||||
|
|
Loading…
Reference in New Issue