[git] GnuPG - branch, ccid_driver_improvement, updated. post-nuke-of-trailing-ws-146-g048ba1a

[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, ccid_driver_improvement has been updated
       via  048ba1aedc4dd20e646a3755e4d39dac0755b474 (commit)
       via  ce4bdfd46b9942116d0d1a1247dd4b020e2737a8 (commit)
      from  fb01522af758be19a16337cd7bf86cef21b7b155 (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 048ba1aedc4dd20e646a3755e4d39dac0755b474
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Jan 5 11:43:37 2012 +0900

    scd: Support VASCO DIGIPASS 920 in the ccid-driver.
    
    * scd/ccid-driver.c (VENDOR_VASCO, VASCO_920): New.
    (ccid_transceive_secure): Maximum is 15 for VASCO DIGIPASS 920.

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 2885487..8e2af65 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -210,7 +210,8 @@ enum {
   VENDOR_OMNIKEY= 0x076b,
   VENDOR_GEMPC  = 0x08e6,
   VENDOR_KAAN   = 0x0d46,
-  VENDOR_FSIJ	= 0x234B
+  VENDOR_FSIJ   = 0x234b,
+  VENDOR_VASCO  = 0x1a44
 };
 
 /* Some product ids.  */
@@ -220,7 +221,7 @@ enum {
 #define SCM_SCR3320     0x5117
 #define SCM_SPR532      0xe003
 #define CHERRY_ST2000   0x003e
-
+#define VASCO_920       0x0920
 
 /* A list and a table with special transport descriptions. */
 enum {
@@ -3131,6 +3132,9 @@ ccid_transceive_secure (ccid_driver_t handle,
     case VENDOR_KAAN: /* Tested with KAAN Advanced (1.02). */
     case VENDOR_FSIJ: /* Tested with the gnuk code (2011-01-05).  */
       break;
+    case VENDOR_VASCO: /* Tested with DIGIPASS 920 */
+      pinlen_max = 15;
+      break;
     case VENDOR_CHERRY:
       /* The CHERRY XX44 keyboard echos an asterisk for each entered
          character on the keyboard channel.  We use a special variant

commit ce4bdfd46b9942116d0d1a1247dd4b020e2737a8
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Jan 5 11:40:58 2012 +0900

    Fix pinpad entry in ccid-driver.
    
    * scd/ccid-driver.c (ccid_transceive_secure): Let it have three
    messages, always.  Fixe bMsgIndex1-3.

diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index 2f8be56..2885487 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -3214,7 +3214,7 @@ ccid_transceive_secure (ccid_driver_t handle,
   if (apdu_buf[1] == 0x20)
     msg[msglen++] = 0xff; /* bNumberMessage: Default. */
   else
-    msg[msglen++] = apdu_buf[2] == 0 ? 0x03 : 0x01; /* bNumberMessage. */
+    msg[msglen++] = 0x03; /* bNumberMessage. */
 
   msg[msglen++] = 0x09; /* wLangId-Low:  English FIXME: use the first entry. */
   msg[msglen++] = 0x04; /* wLangId-High. */
@@ -3223,12 +3223,9 @@ ccid_transceive_secure (ccid_driver_t handle,
     msg[msglen++] = 0;    /* bMsgIndex. */
   else
     {
-      msg[msglen++] = 1;    /* bMsgIndex1. */
-      if (apdu_buf[2] == 0)
-        {
-          msg[msglen++] = 2;    /* bMsgIndex2. */
-          msg[msglen++] = 3;    /* bMsgIndex3. */
-        }
+      msg[msglen++] = 0;    /* bMsgIndex1. */
+      msg[msglen++] = 1;    /* bMsgIndex2. */
+      msg[msglen++] = 2;    /* bMsgIndex3. */
     }
 
   /* bTeoProlog follows: */

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

Summary of changes:
 scd/ccid-driver.c |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)


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