[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.22-9-g07d7015

[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  07d7015e4dcb8a2439ed781928495632ec0b4fa3 (commit)
      from  04e5feea8b62e866520b2d24b6d2fa076bf2b286 (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 07d7015e4dcb8a2439ed781928495632ec0b4fa3
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Nov 11 16:41:43 2013 +0900

    scd: more pinpad fix.
    
    * scd/apdu.c (check_pcsc_pinpad): Set ->minlen and ->maxlen only when
    those are specified.
    (pcsc_pinpad_modify): Remove old check code.
    
    --
    
    cherry picked from master.

diff --git a/scd/apdu.c b/scd/apdu.c
index dc186b5..49ece0b 100644
--- a/scd/apdu.c
+++ b/scd/apdu.c
@@ -2206,8 +2206,11 @@ check_pcsc_pinpad (int slot, int command, pininfo_t *pininfo)
 {
   int r;
 
-  pininfo->minlen = reader_table[slot].pcsc.pinmin;
-  pininfo->maxlen = reader_table[slot].pcsc.pinmax;
+  if (reader_table[slot].pcsc.pinmin >= 0)
+    pininfo->minlen = reader_table[slot].pcsc.pinmin;
+
+  if (reader_table[slot].pcsc.pinmax >= 0)
+    pininfo->maxlen = reader_table[slot].pcsc.pinmax;
 
   if ((command == ISO7816_VERIFY && reader_table[slot].pcsc.verify_ioctl != 0)
       || (command == ISO7816_CHANGE_REFERENCE_DATA
@@ -2330,12 +2333,6 @@ pcsc_pinpad_modify (int slot, int class, int ins, int p0, int p1,
   if (!pininfo->maxlen)
     pininfo->maxlen = 15;
 
-  /* Note that the 25 is the maximum value the SPR532 allows.  */
-  if (pininfo->minlen < 1 || pininfo->minlen > 25
-      || pininfo->maxlen < 1 || pininfo->maxlen > 25
-      || pininfo->minlen > pininfo->maxlen)
-    return SW_HOST_INV_VALUE;
-
   pin_modify = xtrymalloc (len);
   if (!pin_modify)
     return SW_HOST_OUT_OF_CORE;

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

Summary of changes:
 scd/apdu.c |   13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)


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