gpg: Don't let gpg return failure on an invalid packet in a keyblock.
authorWerner Koch <wk@gnupg.org>
Thu, 22 Feb 2018 13:23:01 +0000 (14:23 +0100)
committerWerner Koch <wk@gnupg.org>
Thu, 22 Feb 2018 13:23:01 +0000 (14:23 +0100)
* 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@gnupg.org>
g10/keydb.c
g10/keyring.c

index 58a14a8..03fadfd 100644 (file)
@@ -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;
index 50f1b82..25ef507 100644 (file)
@@ -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;