[git] GPGME - branch, master, updated. gpgme-1.11.0-3-gb52a91f

[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 "GnuPG Made Easy".

The branch, master has been updated
       via  b52a91f5a6818db6b3dd7ce86c01b5d5f6700d0d (commit)
       via  3d8e5c07511938a0b30b4626530822338abd9ec0 (commit)
      from  d98f08fa63e3ef7bd41c0ca812f5e753967ceb37 (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 b52a91f5a6818db6b3dd7ce86c01b5d5f6700d0d
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Apr 19 10:34:32 2018 +0200

    core: Remove leftover debug output.
    
    * src/verify.c (_gpgme_verify_status_handler): Remove debug output.
    --
    
    Actually this is a real bug because it uses a debug function available
    only in the new libgpg-error versions.  Time to call Jenkins back from
    vacation; there are rumors that he has been seen in the city looking
    for a new Ryzen tail coat.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/src/verify.c b/src/verify.c
index bd437c9..26b205a 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -1096,7 +1096,6 @@ _gpgme_verify_status_handler (void *priv, gpgme_status_code_t code, char *args)
         err = _gpgme_parse_plaintext (args, &opd->result.file_name, &mime);
         if (err)
           return err;
-        gpgrt_log_debug ("verify.c: setting mime to %d\n", mime);
         opd->result.is_mime = !!mime;
       }
       break;

commit 3d8e5c07511938a0b30b4626530822338abd9ec0
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Apr 19 10:29:30 2018 +0200

    tests: Fix t-verify test for GnuPG < 2.2.7.
    
    * tests/gpg/t-verify.c (check_result): Tweak for gnupg < 2.2.7.
    --
    
    The not yet releases 2.2.7-beta may print a full fingerprint in the
    ERRSIG status.  This is compliant with the dscription but the new
    t-verify test case did not took in account that older GnuPG versions
    print only a keyid.
    
    Fixes-commit: b99502274ae5efdf6df0d967900ec3d1e64373d7
    GnUPG-bug-id: 3920
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/tests/gpg/t-verify.c b/tests/gpg/t-verify.c
index 7c23406..fa0164a 100644
--- a/tests/gpg/t-verify.c
+++ b/tests/gpg/t-verify.c
@@ -126,9 +126,15 @@ check_result (gpgme_verify_result_t result, int no_of_sigs, int skip_sigs,
     }
   if (strcmp (sig->fpr, fpr))
     {
-      fprintf (stderr, "%s:%i:sig-%d: Unexpected fingerprint: %s\n",
-	       PGM, __LINE__, skip_sigs, sig->fpr);
-      exit (1);
+      if (strlen (sig->fpr) == 16 && strlen (fpr) == 40
+          && !strncmp (sig->fpr, fpr + 24, 16))
+        ; /* okay because gnupg < 2.2.6 only shows the keyid.  */
+      else
+        {
+          fprintf (stderr, "%s:%i:sig-%d: Unexpected fingerprint: %s\n",
+                   PGM, __LINE__, skip_sigs, sig->fpr);
+          exit (1);
+        }
     }
   if (gpgme_err_code (sig->status) != status)
     {

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

Summary of changes:
 src/verify.c         |  1 -
 tests/gpg/t-verify.c | 12 +++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org