security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-19 09:02:22 +02:00
Code Activity

scd: PC/SC reader selection by partial string match.

Browse Source 
* scd/apdu.c (open_pcsc_reader_direct): Partial string match.

--

The card reader name by PC/SC service might include USB bus,
which varies (on some platform like GNU/Linux).  Thus, it's
better to match partial string.

Original patch was submitted by anstein.  I changed it to fallback to
the first reader if no match found.

Note that we need to change pcsc-wrapper.c in 2.0 backport.

GnuPG-bug-id: 1618, 1930
This commit is contained in:
NIIBE Yutaka 2015-04-30 12:36:38 +09:00
parent 172b619348
commit 01a2a61bc4
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scd/apdu.c
View File

@ -1911,6 +1911,7 @@ open_pcsc_reader_direct (const char *portstr)
long err; long err;
int slot; int slot;
char *list = NULL; char *list = NULL;
char *rdrname = NULL;
pcsc_dword_t nreader; pcsc_dword_t nreader;
char *p; char *p;
@ -1963,18 +1964,22 @@ open_pcsc_reader_direct (const char *portstr)
{ {
if (!*p && !p[1]) if (!*p && !p[1])
break; break;
if (*p)
log_info ("detected reader '%s'\n", p); log_info ("detected reader '%s'\n", p);
if (nreader < (strlen (p)+1)) if (nreader < (strlen (p)+1))
{ {
log_error ("invalid response from pcsc_list_readers\n"); log_error ("invalid response from pcsc_list_readers\n");
break; break;
} }
if (!rdrname && portstr && !strncmp (p, portstr, strlen (portstr)))
rdrname = p;
nreader -= strlen (p)+1; nreader -= strlen (p)+1;
p += strlen (p) + 1; p += strlen (p) + 1;
} }
reader_table[slot].rdrname = xtrymalloc (strlen (portstr? portstr : list)+1); if (!rdrname)
rdrname = list;
reader_table[slot].rdrname = xtrystrdup (rdrname);
if (!reader_table[slot].rdrname) if (!reader_table[slot].rdrname)
{ {
log_error ("error allocating memory for reader name\n"); log_error ("error allocating memory for reader name\n");
@ -1983,7 +1988,6 @@ open_pcsc_reader_direct (const char *portstr)
unlock_slot (slot); unlock_slot (slot);
return -1; return -1;
} }
strcpy (reader_table[slot].rdrname, portstr? portstr : list);
xfree (list); xfree (list);
list = NULL; list = NULL;