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,pcsc: Support "reader-port" option for PC/SC reader.

Browse Source 
* scd/apdu.c (apdu_open_reader): Skip use of a reader if it's not the
one specified when it is specified.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2019-09-12 09:30:37 +09:00
parent c569e49d17
commit 6d750fe7fc
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
scd/apdu.c
View File

@ -2058,44 +2058,37 @@ int
apdu_open_reader (struct dev_list *dl) apdu_open_reader (struct dev_list *dl)
{ {
int slot; int slot;
int readerno;
if (!dl->table)
return -1;
/* See whether we want to use the reader ID string or a reader
number. A readerno of -1 indicates that the reader ID string is
to be used. */
if (dl->portstr && strchr (dl->portstr, ':'))
readerno = -1; /* We want to use the readerid. */
else if (dl->portstr)
{
readerno = atoi (dl->portstr);
if (readerno < 0 || readerno >= dl->idx_max)
return -1;
dl->idx = readerno;
dl->portstr = NULL;
}
else
readerno = 0; /* Default. */
#ifdef HAVE_LIBUSB #ifdef HAVE_LIBUSB
if (!opt.disable_ccid) if (!opt.disable_ccid)
{ /* CCID readers. */ { /* CCID readers. */
int readerno;
if (!dl->table)
return -1;
/* See whether we want to use the reader ID string or a reader
number. A readerno of -1 indicates that the reader ID string is
to be used. */
if (dl->portstr && strchr (dl->portstr, ':'))
readerno = -1; /* We want to use the readerid. */
else if (dl->portstr)
{
readerno = atoi (dl->portstr);
if (readerno < 0)
{
return -1;
}
}
else
readerno = 0; /* Default. */
if (readerno > 0) if (readerno > 0)
{ /* Use single, the specific reader. */ { /* Use single, the specific reader. */
if (readerno >= dl->idx_max)
return -1;
dl->idx = readerno;
dl->portstr = NULL;
slot = open_ccid_reader (dl); slot = open_ccid_reader (dl);
/* And stick the reader and no scan. */
dl->idx = dl->idx_max; dl->idx = dl->idx_max;
if (slot >= 0) return slot;
return slot;
else
return -1;
} }
while (dl->idx < dl->idx_max) while (dl->idx < dl->idx_max)
@ -2139,6 +2132,14 @@ apdu_open_reader (struct dev_list *dl)
else else
#endif #endif
{ /* PC/SC readers. */ { /* PC/SC readers. */
if (readerno > 0)
{ /* Use single, the specific reader. */
slot = open_pcsc_reader (pcsc.rdrname[readerno]);
/* And stick the reader and no scan. */
dl->idx = dl->idx_max;
return slot;
}
while (dl->idx < dl->idx_max) while (dl->idx < dl->idx_max)
{ {
const char *rdrname = pcsc.rdrname[dl->idx]; const char *rdrname = pcsc.rdrname[dl->idx];
@ -2157,6 +2158,10 @@ apdu_open_reader (struct dev_list *dl)
if (DBG_READER) if (DBG_READER)
log_debug ("apdu_open_reader: new device=%s\n", rdrname); log_debug ("apdu_open_reader: new device=%s\n", rdrname);
/* When reader string is specified, check if it is the one. */
if (readerno < 0 && strcmp (rdrname, dl->portstr) != 0)
continue;
slot = open_pcsc_reader (rdrname); slot = open_pcsc_reader (rdrname);
dl->idx++; dl->idx++;