[git] GnuPG - branch, master, updated. gnupg-2.1.1-44-g3f6abb5

[by Werner Koch]

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  3f6abb57a7b5e54b593c5775c8f7a07d61119705 (commit)
       via  297b1a0d15873d8765841c54003d244b49090789 (commit)
      from  da4db172f6f8fb254b770e59770c531a488e2400 (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 3f6abb57a7b5e54b593c5775c8f7a07d61119705
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jan 23 15:37:51 2015 +0100

    gpgconf: Fix validity check for UINT32 values.
    
    * tools/gpgconf-comp.c (option_check_validity): Enable check for
    UINT32.
    --
    
    Reported-by: Günther Noack <gnoack at google.com>
    
    This is actually a bug which inhibited the checking of values of type
    UINT32.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tools/gpgconf-comp.c b/tools/gpgconf-comp.c
index 86e67eb..01c4135 100644
--- a/tools/gpgconf-comp.c
+++ b/tools/gpgconf-comp.c
@@ -2365,7 +2365,7 @@ option_check_validity (gc_option_t *option, unsigned long flags,
 	    gc_error (1, 0, "garbage after argument for option %s",
 		      option->name);
 	}
-      else if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_INT32)
+      else if (gc_arg_type[option->arg_type].fallback == GC_ARG_TYPE_UINT32)
 	{
 	  unsigned long res;
 

commit 297b1a0d15873d8765841c54003d244b49090789
Author: Werner Koch <wk at gnupg.org>
Date:   Fri Jan 23 15:30:03 2015 +0100

    gpg,sm: Remove unnecessary duplicated checks
    
    --
    
    Reported-by: Günther Noack <gnoack at google.com>

diff --git a/g10/keygen.c b/g10/keygen.c
index aaccae4..6143269 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -2659,7 +2659,7 @@ ask_user_id (int mode, int full, KBNODE keyblock)
 	    xfree(answer);
 	}
 	xfree(answer);
-	if( !amail && !acomment && !amail )
+	if (!amail && !acomment)
 	    break;
 	xfree(uid); uid = NULL;
     }
diff --git a/sm/verify.c b/sm/verify.c
index 2e91137..73e0ab4 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -467,7 +467,7 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t out_fp)
           s = gcry_md_read (data_md, algo);
           if ( !s || !msgdigestlen
                || gcry_md_get_algo_dlen (algo) != msgdigestlen
-               || !s || memcmp (s, msgdigest, msgdigestlen) )
+               || memcmp (s, msgdigest, msgdigestlen) )
             {
               char *fpr;
 

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

Summary of changes:
 g10/keygen.c         | 2 +-
 sm/verify.c          | 2 +-
 tools/gpgconf-comp.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


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