From 1242c6c93ac63383f648dd84cff847b86f4925f9 Mon Sep 17 00:00:00 2001 From: Andre Heinecke Date: Tue, 29 Oct 2019 16:43:37 +0100 Subject: [PATCH] core: Fix parsing of userid sigs after a subpkg * src/keylist.c (keylist_colon_handler): Do not clear out the tmp_uid when a subpacket line is encountered. -- When the uid is cleared no more signatures following the subpacket are parsed, so we now no longer clear it when a subpacket is encountered. --- src/keylist.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/keylist.c b/src/keylist.c index cdb115fd..a0de7666 100644 --- a/src/keylist.c +++ b/src/keylist.c @@ -621,8 +621,9 @@ keylist_colon_handler (void *priv, char *line) /* Only look at signature and trust info records immediately following a user ID. For this, clear the user ID pointer when - encountering anything but a signature or trust record. */ - if (rectype != RT_SIG && rectype != RT_REV && rectype != RT_TFS) + encountering anything but a signature, trust record or subpacket. */ + if (rectype != RT_SIG && rectype != RT_REV && rectype != RT_TFS && + rectype != RT_SPK) opd->tmp_uid = NULL; /* Only look at subpackets immediately following a signature. For