[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-236-g54cbab2

[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  54cbab29c700db2df74e808f16db49170e6c42f1 (commit)
      from  5c5e52df4b92e23045ac87abac09357de58920d4 (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 54cbab29c700db2df74e808f16db49170e6c42f1
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 8c91767..3376be0 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -1534,6 +1534,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
@@ -1542,9 +1543,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