[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.19-92-g33d2767

[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  33d276791c8169063b22fde96a1760f9f5ef1e63 (commit)
      from  91423a826e3cefd78fc0006e65b56559dd578784 (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 33d276791c8169063b22fde96a1760f9f5ef1e63
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Mar 21 09:04:13 2013 +0900

    scd: change default value of pinpad maxlen.
    
    * scd/apdu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Default value
    of maxlen for pinpad input is now 15 (was: 25).
    
    * scd/ccid-driver.c (ccid_transceive_secure): Likewise.
    
    --
    
    For newer PC/SC, it is better to use FEATURE_GET_TLV_PROPERTIES to get
    bMaxPINSize.

diff --git a/scd/apdu.c b/scd/apdu.c
index 196d58b..268c2fa 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -2086,7 +2086,7 @@ pcsc_pinpad_verify (int slot, int class, int ins, int p0, int p1,
   if (!pininfo->minlen)
     pininfo->minlen = 1;
   if (!pininfo->maxlen)
-    pininfo->maxlen = 25;
+    pininfo->maxlen = 15;
 
   /* Note that the 25 is the maximum value the SPR532 allows.  */
   if (pininfo->minlen < 1 || pininfo->minlen > 25
@@ -2167,7 +2167,7 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
   if (!pininfo->minlen)
     pininfo->minlen = 1;
   if (!pininfo->maxlen)
-    pininfo->maxlen = 25;
+    pininfo->maxlen = 15;
 
   /* Note that the 25 is the maximum value the SPR532 allows.  */
   if (pininfo->minlen < 1 || pininfo->minlen > 25
diff --git a/scd/ccid-driver.c b/scd/ccid-driver.c
index dd9fabe..c3a66fa 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -3358,7 +3358,7 @@ ccid_transceive_secure (ccid_driver_t handle,
   if (!pininfo->minlen)
     pininfo->minlen = 1;
   if (!pininfo->maxlen)
-    pininfo->maxlen = 25;
+    pininfo->maxlen = 15;
 
   /* Note that the 25 is the maximum value the SPR532 allows.  */
   if (pininfo->minlen < 1 || pininfo->minlen > 25
@@ -3373,13 +3373,14 @@ ccid_transceive_secure (ccid_driver_t handle,
     case VENDOR_SCM:  /* Tested with SPR 532. */
     case VENDOR_KAAN: /* Tested with KAAN Advanced (1.02). */
     case VENDOR_FSIJ: /* Tested with Gnuk (0.21). */
+      pininfo->maxlen = 25;
       enable_varlen = 1;
       break;
     case VENDOR_VASCO: /* Tested with DIGIPASS 920 */
       enable_varlen = 1;
-      pininfo->maxlen = 15;
       break;
     case VENDOR_CHERRY:
+      pininfo->maxlen = 25;
       enable_varlen = 1;
       /* The CHERRY XX44 keyboard echos an asterisk for each entered
          character on the keyboard channel.  We use a special variant

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

Summary of changes:
 scd/apdu.c        |    4 ++--
 scd/ccid-driver.c |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)


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