summaryrefslogtreecommitdiffstats
path: root/scd
diff options
context:
space:
mode:
authorNIIBE Yutaka <gniibe@fsij.org>2013-10-25 02:57:31 +0200
committerNIIBE Yutaka <gniibe@fsij.org>2013-10-25 02:57:31 +0200
commitde7e15c6b80164a351586e9087aad86420c8b89e (patch)
treeae8925b32012261d1471811aa54594640ddecfe6 /scd
parentpo: Update Japanese translation. (diff)
downloadgnupg2-de7e15c6b80164a351586e9087aad86420c8b89e.tar.xz
gnupg2-de7e15c6b80164a351586e9087aad86420c8b89e.zip
scd: fix pinpad input on Windows.
* scd/apdu.c (open_pcsc_reader_direct): Don't call pcsc_vendor_specific_init here, but... (connect_pcsc_card): Call it here. -- Thanks to Martin Wolters for the bug report.
Diffstat (limited to 'scd')
-rw-r--r--scd/apdu.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/scd/apdu.c b/scd/apdu.c
index 58f607500..0351e0023 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -1508,6 +1508,8 @@ connect_pcsc_card (int slot)
pcsc_dword_t readerlen, atrlen;
long card_state, card_protocol;
+ pcsc_vendor_specific_init (slot);
+
atrlen = DIM (reader_table[0].atr);
readerlen = sizeof reader -1 ;
err = pcsc_status (reader_table[slot].pcsc.card,
@@ -1929,7 +1931,6 @@ open_pcsc_reader_direct (const char *portstr)
reader_table[slot].send_apdu_reader = pcsc_send_apdu;
reader_table[slot].dump_status_reader = dump_pcsc_reader_status;
- pcsc_vendor_specific_init (slot);
dump_reader_status (slot);
return slot;
}