From 4c7d63cd5b02ebfd09933bebd1312e01958b3e20 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 21 May 2019 17:27:42 +0200 Subject: gpg: Do not bail on an invalid packet in the local keyring. * g10/keydb.c (parse_keyblock_image): Treat invalid packet special. -- This is in particular useful to run --list-keys on a keyring with corrupted packets. The extra flush is to keep the diagnostic close to the regular --list-key output. Signed-off-by: Werner Koch --- g10/keydb.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/g10/keydb.c b/g10/keydb.c index 45eb4aa34..a7691bbe2 100644 --- a/g10/keydb.c +++ b/g10/keydb.c @@ -1242,8 +1242,15 @@ parse_keyblock_image (iobuf_t iobuf, int pk_no, int uid_no, } if (err) { + es_fflush (es_stdout); log_error ("parse_keyblock_image: read error: %s\n", gpg_strerror (err)); + if (gpg_err_code (err) == GPG_ERR_INV_PACKET) + { + free_packet (pkt, &parsectx); + init_packet (pkt); + continue; + } err = gpg_error (GPG_ERR_INV_KEYRING); break; } -- cgit v1.2.3