diff options
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/apdu.c | 11 | ||||
| -rw-r--r-- | scd/apdu.h | 2 | ||||
| -rw-r--r-- | scd/ccid-driver.c | 8 | ||||
| -rw-r--r-- | scd/ccid-driver.h | 3 | ||||
| -rw-r--r-- | scd/command.c | 9 |
5 files changed, 28 insertions, 5 deletions
diff --git a/scd/apdu.c b/scd/apdu.c index 1aebdd331..41790c61c 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -2466,6 +2466,7 @@ static int close_ccid_reader (int slot) { ccid_close_reader (reader_table[slot].ccid.handle); + reader_table[slot].rdrname = NULL; reader_table[slot].used = 0; return 0; } @@ -2619,7 +2620,8 @@ open_ccid_reader (const char *portstr) return -1; slotp = reader_table + slot; - err = ccid_open_reader (&slotp->ccid.handle, portstr); + err = ccid_open_reader (&slotp->ccid.handle, portstr, + (const char **)&slotp->rdrname); if (err) { slotp->used = 0; @@ -4326,3 +4328,10 @@ apdu_send_direct (int slot, size_t extended_length, return 0; } + + +const char * +apdu_get_reader_name (int slot) +{ + return reader_table[slot].rdrname; +} diff --git a/scd/apdu.h b/scd/apdu.h index 7e30f761b..1694eac80 100644 --- a/scd/apdu.h +++ b/scd/apdu.h @@ -134,6 +134,6 @@ int apdu_send_direct (int slot, size_t extended_length, const unsigned char *apdudata, size_t apdudatalen, int handle_more, unsigned char **retbuf, size_t *retbuflen); - +const char *apdu_get_reader_name (int slot); #endif /*APDU_H*/ diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c index b64f24ce7..bf5b73575 100644 --- a/scd/ccid-driver.c +++ b/scd/ccid-driver.c @@ -1542,7 +1542,8 @@ ccid_vendor_specific_init (ccid_driver_t handle) /* Open the reader with the internal number READERNO and return a pointer to be used as handle in HANDLE. Returns 0 on success. */ int -ccid_open_reader (ccid_driver_t *handle, const char *readerid) +ccid_open_reader (ccid_driver_t *handle, const char *readerid, + const char **rdrname_p) { int rc = 0; struct usb_device *dev = NULL; @@ -1661,6 +1662,9 @@ ccid_open_reader (ccid_driver_t *handle, const char *readerid) free (*handle); *handle = NULL; } + else + if (rdrname_p) + *rdrname_p = (*handle)->rid; return rc; } @@ -3735,7 +3739,7 @@ main (int argc, char **argv) break; } - rc = ccid_open_reader (&ccid, argc? *argv:NULL); + rc = ccid_open_reader (&ccid, argc? *argv:NULL, NULL); if (rc) return 1; diff --git a/scd/ccid-driver.h b/scd/ccid-driver.h index e62ad5ca2..be8a5ce31 100644 --- a/scd/ccid-driver.h +++ b/scd/ccid-driver.h @@ -111,7 +111,8 @@ typedef struct ccid_driver_s *ccid_driver_t; int ccid_set_debug_level (int level); char *ccid_get_reader_list (void); -int ccid_open_reader (ccid_driver_t *handle, const char *readerid); +int ccid_open_reader (ccid_driver_t *handle, const char *readerid, + const char **rdrname_p); int ccid_set_progress_cb (ccid_driver_t handle, void (*cb)(void *, const char *, int, int, int), void *cb_arg); diff --git a/scd/command.c b/scd/command.c index 41a150b4d..a7033e856 100644 --- a/scd/command.c +++ b/scd/command.c @@ -667,9 +667,18 @@ cmd_learn (assuan_context_t ctx, char *line) knows about this card */ if (!only_keypairinfo) { + int slot; + const char *reader; char *serial; time_t stamp; + slot = vreader_slot (ctrl->server_local->vreader_idx); + reader = apdu_get_reader_name (slot); + if (!reader) + return out_of_core (); + send_status_direct (ctrl, "READER", reader); + /* No need to free the string of READER. */ + rc = app_get_serial_and_stamp (ctrl->app_ctx, &serial, &stamp); if (rc) return rc; |