diff options
| author | Andre Heinecke <[email protected]> | 2019-10-29 15:43:37 +0000 | 
|---|---|---|
| committer | Andre Heinecke <[email protected]> | 2019-10-29 15:43:37 +0000 | 
| commit | 1242c6c93ac63383f648dd84cff847b86f4925f9 (patch) | |
| tree | 3581ef17dbf65a8de386b8e1d049e5587df0702b | |
| parent | qt,tests: Add test for remarks (diff) | |
| download | gpgme-1242c6c93ac63383f648dd84cff847b86f4925f9.tar.gz gpgme-1242c6c93ac63383f648dd84cff847b86f4925f9.zip | |
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.
| -rw-r--r-- | src/keylist.c | 5 | 
1 files 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 | 
