[Pkg-gnupg-commit] [gnupg2] 25/132: scd: Relax a condition for p15 driver.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 7501f2e9c4e6fd94a191b381d52ec2fe1d103e29
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Mon Apr 10 13:18:30 2017 +0900

    scd: Relax a condition for p15 driver.
    
    * scd/app-p15.c (read_ef_aodf): Fix.
    
    --
    
    Fixes-commit: 3c1ad96f1ce838daf2d861b33e6611f6d3043d25
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
 scd/app-p15.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scd/app-p15.c b/scd/app-p15.c
index f0bcdf4..0bb5f9e 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 (ul))
+      if (!err && objlen > sizeof (ul))
         err = gpg_error (GPG_ERR_UNSUPPORTED_ENCODING);
       if (err)
         goto parse_error;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git