From 980d0234d31699e51051e0cc6002ad177b6e7136 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 12 Sep 2019 09:34:34 +0900 Subject: [PATCH] scd: Remove old fallback logic from CCID to PC/SC. * scd/apdu.c (apdu_dev_list_start): Return an error on failure. Signed-off-by: NIIBE Yutaka --- scd/apdu.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/scd/apdu.c b/scd/apdu.c index ced246b3a..9d0444b78 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -1939,19 +1939,12 @@ apdu_dev_list_start (const char *portstr, struct dev_list **l_p) 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) - log_debug ("leave: apdu_open_reader => slot=-1 (no ccid)\n"); + if (DBG_READER) + log_debug ("leave: apdu_open_reader => slot=-1 (no ccid)\n"); - xfree (dl); - npth_mutex_unlock (&reader_table_lock); - return gpg_error (GPG_ERR_ENODEV); - } - else - dl->idx_max = 1; + xfree (dl); + npth_mutex_unlock (&reader_table_lock); + return gpg_error (GPG_ERR_ENODEV); } } else