diff options
Diffstat (limited to '')
| -rw-r--r-- | scd/apdu.c | 14 | ||||
| -rw-r--r-- | scd/apdu.h | 2 | ||||
| -rw-r--r-- | scd/app.c | 2 |
3 files changed, 13 insertions, 5 deletions
diff --git a/scd/apdu.c b/scd/apdu.c index 6fc62aa00..82d53b1fa 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -3127,7 +3127,7 @@ apdu_open_one_reader (const char *portstr) } int -apdu_open_reader (struct dev_list *dl) +apdu_open_reader (struct dev_list *dl, int app_empty) { int slot; @@ -3177,6 +3177,7 @@ apdu_open_reader (struct dev_list *dl) /* Check identity by BAI against already opened HANDLEs. */ for (slot = 0; slot < MAX_READER; slot++) if (reader_table[slot].used + && reader_table[slot].ccid.handle && ccid_compare_BAI (reader_table[slot].ccid.handle, bai)) break; @@ -3201,12 +3202,19 @@ apdu_open_reader (struct dev_list *dl) dl->idx++; } - slot = -1; + /* Not found. Try one for PC/SC, only when it's the initial scan. */ + if (app_empty && dl->idx == dl->idx_max) + { + dl->idx++; + slot = apdu_open_one_reader (dl->portstr); + } + else + slot = -1; } else #endif { /* PC/SC readers. */ - if (dl->idx == 0) + if (app_empty && dl->idx == 0) { dl->idx++; slot = apdu_open_one_reader (dl->portstr); diff --git a/scd/apdu.h b/scd/apdu.h index 473def518..6751e8c9b 100644 --- a/scd/apdu.h +++ b/scd/apdu.h @@ -91,7 +91,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 apdu_open_reader (struct dev_list *l, int app_empty); int apdu_open_remote_reader (const char *portstr, const unsigned char *cookie, size_t length, int (*readfnc) (void *opaque, @@ -343,7 +343,7 @@ select_application (ctrl_t ctrl, const char *name, app_t *r_app, int slot; int periodical_check_needed_this; - slot = apdu_open_reader (l); + slot = apdu_open_reader (l, !app_top); if (slot < 0) break; |