[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-198-ga75a08d

[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  a75a08d6e30e93e1793aa78a15d473a3ea7623cb (commit)
       via  ca66f5c779af74d0eb7221afd7a9707201931e50 (commit)
      from  eaa6dc3a8b4f31525650cd4785d6bafab86d68b7 (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 a75a08d6e30e93e1793aa78a15d473a3ea7623cb
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Thu Mar 21 09:11:15 2013 +0900

    po: Enable ja.po.
    
    * po/LINGUAS: Enable ja.po.

diff --git a/po/LINGUAS b/po/LINGUAS
index 1fc9664..76ab343 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -15,7 +15,7 @@ fr
 #hu
 #id
 #it
-#ja
+ja
 #nb
 #pl
 #pt_BR

commit ca66f5c779af74d0eb7221afd7a9707201931e50
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 6824ded..e920678 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -2056,7 +2056,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
@@ -2139,7 +2139,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 da5fac9..8c91767 100644
--- a/scd/ccid-driver.c
+++ b/scd/ccid-driver.c
@@ -3357,7 +3357,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
@@ -3371,14 +3371,15 @@ 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 the gnuk code (2011-01-05).  */
+    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:
 po/LINGUAS        |    2 +-
 scd/apdu.c        |    4 ++--
 scd/ccid-driver.c |    7 ++++---
 3 files changed, 7 insertions(+), 6 deletions(-)


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