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: Remove old fallback logic from CCID to PC/SC.

Browse Source 
* scd/apdu.c (apdu_dev_list_start): Return an error on failure.

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

7
scd/apdu.c
View File

@ -1938,10 +1938,6 @@ apdu_dev_list_start (const char *portstr, struct dev_list **l_p)
} }
if (dl->idx_max == 0) if (dl->idx_max == 0)
{
/* If a CCID reader specification has been given, the user does
not want a fallback to other drivers. */
if (portstr && strlen (portstr) > 5 && portstr[4] == ':')
{ {
if (DBG_READER) if (DBG_READER)
log_debug ("leave: apdu_open_reader => slot=-1 (no ccid)\n"); log_debug ("leave: apdu_open_reader => slot=-1 (no ccid)\n");
@ -1950,9 +1946,6 @@ apdu_dev_list_start (const char *portstr, struct dev_list **l_p)
npth_mutex_unlock (&reader_table_lock); npth_mutex_unlock (&reader_table_lock);
return gpg_error (GPG_ERR_ENODEV); return gpg_error (GPG_ERR_ENODEV);
} }
else
dl->idx_max = 1;
}
} }
else else
#endif #endif