From 2b92007aba5f1ee0ca99466b16698ecffb435b6f Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Fri, 25 Oct 2013 09:57:31 +0900 Subject: 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 (backport from master). --- scd/apdu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scd/apdu.c b/scd/apdu.c index 1ef0d9d86..a51e1810b 100644 --- a/scd/apdu.c +++ b/scd/apdu.c @@ -1526,6 +1526,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, @@ -1950,7 +1952,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); unlock_slot (slot); return slot; -- cgit v1.2.3