[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.22-7-g2b92007

[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, STABLE-BRANCH-2-0 has been updated
       via  2b92007aba5f1ee0ca99466b16698ecffb435b6f (commit)
      from  4413e8c6ecb154bea62cc42ec434ac528d8cb209 (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 2b92007aba5f1ee0ca99466b16698ecffb435b6f
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 (backport from master).

diff --git a/scd/apdu.c b/scd/apdu.c
index 1ef0d9d..a51e181 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;

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

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