security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

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 <wk@gnupg.org>

This is a backport from master with support for the unsupported v5 key
handling.
This commit is contained in:
Werner Koch 2019-05-21 17:27:42 +02:00
parent d32963eeb3
commit 30f44957cc
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
g10/keydb.c
View File

@ -1249,12 +1249,19 @@ parse_keyblock_image (iobuf_t iobuf, int pk_no, int uid_no,
}
if (err)
{
if (gpg_err_code (err) != GPG_ERR_UNKNOWN_VERSION)
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)
{
log_error ("parse_keyblock_image: read error: %s\n",
gpg_strerror (err));
err = gpg_error (GPG_ERR_INV_KEYRING);
free_packet (pkt, &parsectx);
init_packet (pkt);
continue;
}
/* Unknown version maybe due to v5 keys - we treat this
* error different. */
if (gpg_err_code (err) != GPG_ERR_UNKNOWN_VERSION)
err = gpg_error (GPG_ERR_INV_KEYRING);
break;
}