security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

scd: Add reder information to --card-status.

Browse source 
* g10/call-agent.h, g10/call-agent.c (agent_release_card_info)
g10/card-util.c (card_status): Add READER.
* scd/apdu.c (close_ccid_reader, open_ccid_reader): Handle RDRNAME.
(apdu_get_reader_name): New.
* scd/ccid-driver.c (ccid_open_reader): Add argument to RDRNAME_P.
* scd/command.c (cmd_learn): Return READER information.
This commit is contained in:
NIIBE Yutaka 2015-11-09 16:15:44 +09:00
parent 2242658efe
commit bce0e3f71d
8 changed files with 41 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scd/ccid-driver.c
View file

@ -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;