gpg,sm: Remove unnecessary duplicated checks

--

Reported-by: Günther Noack <gnoack@google.com>

diff --git a/g10/keygen.c b/g10/keygen.c
index aaccae4..6143269 100644 (file)
--- 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 (file)
--- 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;