[svn] GnuPG - r4829 - trunk/scd

[svn author marcus]

Author: marcus
Date: 2008-09-23 15:04:42 +0200 (Tue, 23 Sep 2008)
New Revision: 4829

Modified:
   trunk/scd/ChangeLog
   trunk/scd/apdu.c
Log:

Marcus Brinkmann  <marcus at g10code.com>

        * apdu.c (pcsc_get_status): Be more relaxed with the usable flag
        under Windows.

M    scd/ChangeLog
M    scd/apdu.c


Modified: trunk/scd/ChangeLog
===================================================================
--- trunk/scd/ChangeLog	2008-09-23 10:36:09 UTC (rev 4828)
+++ trunk/scd/ChangeLog	2008-09-23 13:04:42 UTC (rev 4829)
@@ -1,3 +1,8 @@
+2008-09-23  Marcus Brinkmann  <marcus at g10code.com>
+
+	* apdu.c (pcsc_get_status): Be more relaxed with the usable flag
+	under Windows.
+
 2008-09-23  Werner Koch  <wk at g10code.com>
 
 	* app-openpgp.c (do_setattr): Use command chaining for long

Modified: trunk/scd/apdu.c
===================================================================
--- trunk/scd/apdu.c	2008-09-23 10:36:09 UTC (rev 4828)
+++ trunk/scd/apdu.c	2008-09-23 13:04:42 UTC (rev 4829)
@@ -1082,12 +1082,19 @@
     *status |= 2;
   if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) )
     *status |= 4;
+#ifndef HAVE_W32_SYSTEM
   /* We indicate a useful card if it is not in use by another
      application.  This is because we only use exclusive access
      mode.  */
   if ( (*status & 6) == 6
        && !(rdrstates[0].event_state & PCSC_STATE_INUSE) )
     *status |= 1;
+#else
+  /* Some winscard drivers may set EXCLUSIVE and INUSE at the same
+     time when we are the only user (SCM SCR335) under Windows.  */
+  if ((status & 6) == 6)
+    status |= 1;
+#endif
 
   return 0;
 #endif /*!NEED_PCSC_WRAPPER*/