[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.22-8-g04e5fee

[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  04e5feea8b62e866520b2d24b6d2fa076bf2b286 (commit)
      from  2b92007aba5f1ee0ca99466b16698ecffb435b6f (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 04e5feea8b62e866520b2d24b6d2fa076bf2b286
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Oct 29 09:07:05 2013 +0900

    scd: pinpad fix for PC/SC on Windows.
    
    * scd/apdu.c (SCARD_CTL_CODE): Fix for Windows.
    
    --
    
    cherry picked from master.

diff --git a/scd/apdu.c b/scd/apdu.c
index a51e181..dc186b5 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -227,7 +227,13 @@ static char (* DLSTDCALL CT_close) (unsigned short ctn);
 
 /* Fix pcsc-lite ABI incompatibilty.  */
 #ifndef SCARD_CTL_CODE
-# define SCARD_CTL_CODE(code) (0x42000000 + (code))
+#ifdef _WIN32
+#include <winioctl.h>
+#define SCARD_CTL_CODE(code) CTL_CODE(FILE_DEVICE_SMARTCARD, (code), \
+				      METHOD_BUFFERED, FILE_ANY_ACCESS)
+#else
+#define SCARD_CTL_CODE(code) (0x42000000 + (code))
+#endif
 #endif
 
 #define CM_IOCTL_GET_FEATURE_REQUEST     SCARD_CTL_CODE(3400)
@@ -330,6 +336,7 @@ long (* DLSTDCALL pcsc_control) (long card,
 
 
 /*  Prototypes.  */
+static int pcsc_vendor_specific_init (int slot);
 static int pcsc_get_status (int slot, unsigned int *status);
 static int reset_pcsc_reader (int slot);
 static int apdu_get_status_internal (int slot, int hang, int no_atr_reset,

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

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


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