security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-08 12:44:23 +01:00
Code Activity

scd,pcsc: Remove the restriction of no-scanning in PC/SC.

Browse Source 
* 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 <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2019-09-12 08:48:48 +09:00
parent 92be4e87ee
commit c569e49d17
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scd/apdu.c
View File

@ -2055,7 +2055,7 @@ apdu_dev_list_finish (struct dev_list *dl)
int int
apdu_open_reader (struct dev_list *dl, int app_empty) apdu_open_reader (struct dev_list *dl)
{ {
int slot; int slot;
@ -2175,15 +2175,6 @@ apdu_open_reader (struct dev_list *dl, int app_empty)
/* Not found. */ /* Not found. */
slot = -1; 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; return slot;

2
scd/apdu.h
View File

@ -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); void apdu_dev_list_finish (struct dev_list *l);
/* Note, that apdu_open_reader returns no status word but -1 on error. */ /* 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, int apdu_open_remote_reader (const char *portstr,
const unsigned char *cookie, size_t length, const unsigned char *cookie, size_t length,
int (*readfnc) (void *opaque, int (*readfnc) (void *opaque,

2
scd/app.c
View File

@ -645,7 +645,7 @@ select_application (ctrl_t ctrl, const char *name, card_t *r_card,
int slot; int slot;
int periodical_check_needed_this; int periodical_check_needed_this;
slot = apdu_open_reader (l, !card_top); slot = apdu_open_reader (l);
if (slot < 0) if (slot < 0)
break; break;