[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.21-4-g6d8f36a

[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  6d8f36a0458a50685e130c55018e0d941101d952 (commit)
      from  b63717031d8ee3f9ded44a182516158f8a349bd1 (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 6d8f36a0458a50685e130c55018e0d941101d952
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Aug 27 10:15:46 2013 +0900

    scd: fix Vega for Alpha reader.
    
    * scd/ccid-driver.c (ccid_vendor_specific_init): Fix error handling
    and size of command.
    
    --
    
    Signed-off-by: NIIBE Yutaka

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 42a219f..b812cb0 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -1537,6 +1537,7 @@ ccid_vendor_specific_init (ccid_driver_t handle)
 {
   if (handle->id_vendor == VENDOR_VEGA && handle->id_product == VEGA_ALPHA)
     {
+      int r;
       /*
        * Vega alpha has a feature to show retry counter on the pinpad
        * display.  But it assumes that the card returns the value of
@@ -1545,9 +1546,12 @@ ccid_vendor_specific_init (ccid_driver_t handle)
        * VERIFY command with empty data.  This vendor specific command
        * sequence is to disable the feature.
        */
-      const unsigned char cmd[] = "\xb5\x01\x00\x03\x00";
+      const unsigned char cmd[] = { '\xb5', '\x01', '\x00', '\x03', '\x00' };
 
-      return send_escape_cmd (handle, cmd, sizeof (cmd), NULL, 0, NULL);
+      r = send_escape_cmd (handle, cmd, sizeof (cmd), NULL, 0, NULL);
+      if (r != 0 && r != CCID_DRIVER_ERR_CARD_INACTIVE
+          && r != CCID_DRIVER_ERR_NO_CARD)
+        return r;
     }
 
   return 0;

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

Summary of changes:
 scd/ccid-driver.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)


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