[git] GnuPG - branch, master, updated. gnupg-2.1.20-24-g3c1ad96

[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  3c1ad96f1ce838daf2d861b33e6611f6d3043d25 (commit)
      from  34199ef677bb40eadf0da696a111f7036bc3187e (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 3c1ad96f1ce838daf2d861b33e6611f6d3043d25
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Apr 10 12:59:29 2017 +0900

    scd: Relax a condition for p15 driver.
    
    * scd/app-p15.c (read_ef_aodf): Remove possibly redundant condition.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/scd/app-p15.c b/scd/app-p15.c
index 68e8c4f..f0bcdf4 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -1823,7 +1823,7 @@ read_ef_aodf (app_t app, unsigned short fid, aodf_object_t *result)
       if (!err && (objlen > nn
                    || class != CLASS_UNIVERSAL || tag != TAG_ENUMERATED))
         err = gpg_error (GPG_ERR_INV_OBJ);
-      if (!err && (objlen > sizeof (pin_type_t) || objlen > sizeof (ul)))
+      if (!err && || objlen > sizeof (ul))
         err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
       if (err)
         goto parse_error;

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

Summary of changes:
 scd/app-p15.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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