[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-258-g32989ad

[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  32989ad2b152d18198d718bc2c7232ce3e79c72f (commit)
      from  a15c35f37ed2b58805adc213029998aa3e52f038 (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 32989ad2b152d18198d718bc2c7232ce3e79c72f
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.

diff --git a/scd/apdu.c b/scd/apdu.c
index 0351e00..e0127d8 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -246,7 +246,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)
@@ -349,6 +355,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