[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.4-37-gb375d50

[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, STABLE-BRANCH-2-2 has been updated
       via  b375d50ee4ce52c9b0f0855ec155be027642fb05 (commit)
      from  88e766d3915c2919e9968148ebb30463d4a673e4 (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 b375d50ee4ce52c9b0f0855ec155be027642fb05
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Feb 22 14:23:01 2018 +0100

    gpg: Don't let gpg return failure on an invalid packet in a keyblock.
    
    * g10/keydb.c (parse_keyblock_image): Use log_info instead of
    log_error for skipped packets.
    * g10/keyring.c (keyring_get_keyblock): Ditto.
    --
    
    log_info should be sufficient and makes this more robust.  Some
    tools (e.g. Enigmail) are too picky on return codes from gpg.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keydb.c b/g10/keydb.c
index 58a14a8..03fadfd 100644
--- a/g10/keydb.c
+++ b/g10/keydb.c
@@ -1269,10 +1269,7 @@ parse_keyblock_image (iobuf_t iobuf, int pk_no, int uid_no,
           break; /* Allowed per RFC.  */
 
         default:
-          /* Note that can't allow ring trust packets here and some of
-             the other GPG specific packets don't make sense either.  */
-          log_error ("skipped packet of type %d in keybox\n",
-                     (int)pkt->pkttype);
+          log_info ("skipped packet of type %d in keybox\n", (int)pkt->pkttype);
           free_packet(pkt, &parsectx);
           init_packet(pkt);
           continue;
diff --git a/g10/keyring.c b/g10/keyring.c
index 50f1b82..25ef507 100644
--- a/g10/keyring.c
+++ b/g10/keyring.c
@@ -459,8 +459,8 @@ keyring_get_keyblock (KEYRING_HANDLE hd, KBNODE *ret_kb)
             break; /* Allowed by us.  */
 
           default:
-	    log_error ("skipped packet of type %d in keyring\n",
-                       (int)pkt->pkttype);
+	    log_info ("skipped packet of type %d in keyring\n",
+                      (int)pkt->pkttype);
 	    free_packet(pkt, &parsectx);
 	    init_packet(pkt);
 	    continue;

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

Summary of changes:
 g10/keydb.c   | 5 +----
 g10/keyring.c | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)


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