[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-256-gde7e15c

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  de7e15c6b80164a351586e9087aad86420c8b89e (commit)
      from  b66158cac7347e4c56c79ab7b5416ae5b3f4a0a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit de7e15c6b80164a351586e9087aad86420c8b89e
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Oct 25 09:57:31 2013 +0900

    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.

diff --git a/scd/apdu.c b/scd/apdu.c
index 58f6075..0351e00 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;
 }

-----------------------------------------------------------------------

Summary of changes:
 scd/apdu.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org