[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.19-96-gc349520

[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  c3495209ee6bdac6d6c631ded632fd540596f6e4 (commit)
      from  247bec6a6f6a3358b38818a972430c7329f5b0d9 (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 c3495209ee6bdac6d6c631ded632fd540596f6e4
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Mar 26 12:43:24 2013 +0900

    scd: PC/SC status fix.
    
    * scd/apdu.c (pcsc_get_status_direct): Check PCSC_STATE_MUTE only when
    PCSC_STATE_PRESENT.
    
    * scd/pcsc-wrapper.c (handle_status): Ditto.

diff --git a/scd/apdu.c b/scd/apdu.c
index d8f7c5f..4f40a69 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -914,9 +914,11 @@ pcsc_get_status_direct (int slot, unsigned int *status)
 
   *status = 0;
   if ( (rdrstates[0].event_state & PCSC_STATE_PRESENT) )
-    *status |= APDU_CARD_PRESENT;
-  if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) )
-    *status |= APDU_CARD_ACTIVE;
+    {
+      *status |= APDU_CARD_PRESENT;
+      if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) )
+	*status |= APDU_CARD_ACTIVE;
+    }
 #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
diff --git a/scd/pcsc-wrapper.c b/scd/pcsc-wrapper.c
index 04d08a1..7d9415a 100644
--- a/scd/pcsc-wrapper.c
+++ b/scd/pcsc-wrapper.c
@@ -602,9 +602,11 @@ handle_status (unsigned char *argbuf, size_t arglen)
   if ( !(rdrstates[0].event_state & PCSC_STATE_UNKNOWN) )
     {
       if ( (rdrstates[0].event_state & PCSC_STATE_PRESENT) )
-        status |= 2;
-      if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) )
-        status |= 4;
+	{
+	  status |= 2;
+	  if ( !(rdrstates[0].event_state & PCSC_STATE_MUTE) )
+	    status |= 4;
+	}
       /* We indicate a useful card if it is not in use by another
          application.  This is because we only use exclusive access
          mode.  */

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

Summary of changes:
 scd/apdu.c         |    8 +++++---
 scd/pcsc-wrapper.c |    8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)


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