From c569e49d1764d2573aec5684f9cee397bdd8ccb1 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 12 Sep 2019 08:48:48 +0900 Subject: scd,pcsc: Remove the restriction of no-scanning in PC/SC. * scd/apdu.h (app_open_reader): Remove the last argument. * scd/apdu.c (app_open_reader): Ditto. * scd/app.c (select_application): Don't supply APP_EMPTY. Signed-off-by: NIIBE Yutaka --- scd/apdu.c | 11 +---------- scd/apdu.h | 2 +- scd/app.c | 2 +- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/scd/apdu.c b/scd/apdu.c index af747c07d..99daef63d 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -2055,7 +2055,7 @@ apdu_dev_list_finish (struct dev_list *dl) int -apdu_open_reader (struct dev_list *dl, int app_empty) +apdu_open_reader (struct dev_list *dl) { int slot; @@ -2175,15 +2175,6 @@ apdu_open_reader (struct dev_list *dl, int app_empty) /* Not found. */ slot = -1; -#if 0 - if (app_empty && dl->idx == 0) - { - dl->idx++; - slot = apdu_open_one_reader (dl->portstr); - } - else - slot = -1; -#endif } return slot; diff --git a/scd/apdu.h b/scd/apdu.h index 89df45cb8..cdf94ccca 100644 --- a/scd/apdu.h +++ b/scd/apdu.h @@ -93,7 +93,7 @@ gpg_error_t apdu_dev_list_start (const char *portstr, struct dev_list **l_p); void apdu_dev_list_finish (struct dev_list *l); /* Note, that apdu_open_reader returns no status word but -1 on error. */ -int apdu_open_reader (struct dev_list *l, int app_empty); +int apdu_open_reader (struct dev_list *l); int apdu_open_remote_reader (const char *portstr, const unsigned char *cookie, size_t length, int (*readfnc) (void *opaque, diff --git a/scd/app.c b/scd/app.c index 8acd15ff3..fff2b307f 100644 --- a/scd/app.c +++ b/scd/app.c @@ -645,7 +645,7 @@ select_application (ctrl_t ctrl, const char *name, card_t *r_card, int slot; int periodical_check_needed_this; - slot = apdu_open_reader (l, !card_top); + slot = apdu_open_reader (l); if (slot < 0) break; -- cgit v1.2.3