aboutsummaryrefslogtreecommitdiffstats
path: root/scd/app.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2017-02-13 02:09:13 +0000
committerNIIBE Yutaka <[email protected]>2017-02-13 02:09:13 +0000
commitda4c132cca2c6df81243c9660b7348268a848f88 (patch)
treeb3ac676f9f4aa45d1a1b7ae3f09d17d595bbfc5c /scd/app.c
parentgpg: Fix memory leak in the error case of signature creation. (diff)
downloadgnupg-da4c132cca2c6df81243c9660b7348268a848f88.tar.gz
gnupg-da4c132cca2c6df81243c9660b7348268a848f88.zip
scd: Fix use case of PC/SC.
* scd/apdu.c (apdu_open_reader): Add an argument APP_EMPTY. When CCID driver fails to open, try PC/SC if APP is nothing. * scd/app.c (select_application): Supply arg if APP is nothing. -- After scanning available card readers by CCID driver, scdaemon should try PC/SC service if no APP is registered yet. Also, when the slot is allocated for PC/SC (ccid.handle==NULL), it should not call ccid_compare_BAI, otherwise scdaemon crashes. Debian-bug-id: 852702, 854005, 854595, 854616 Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'scd/app.c')
-rw-r--r--scd/app.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scd/app.c b/scd/app.c
index 5b8da1c38..7e728705a 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -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;