aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal H. Walfield <[email protected]>2016-09-05 14:44:09 +0000
committerNeal H. Walfield <[email protected]>2016-09-05 14:48:51 +0000
commit9082bde01cc18e32504ce39d55ea6dd3c05dddec (patch)
tree043410d2a471dc557161fe0462bbe6fe9ef5c847
parentagent: Silence --debug IPC output for connections from self. (diff)
downloadgnupg-9082bde01cc18e32504ce39d55ea6dd3c05dddec.tar.gz
gnupg-9082bde01cc18e32504ce39d55ea6dd3c05dddec.zip
g10: Don't add user attributes to the TOFU DB.
* g10/trustdb.c (tdb_get_validity_core): Skip user attributes. -- Signed-off-by: Neal H. Walfield <[email protected]>
-rw-r--r--g10/trustdb.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/g10/trustdb.c b/g10/trustdb.c
index 4181240b7..6f63c347c 100644
--- a/g10/trustdb.c
+++ b/g10/trustdb.c
@@ -1040,6 +1040,14 @@ tdb_get_validity_core (ctrl_t ctrl,
else
user_id = n->pkt->pkt.user_id;
+ if (user_id->attrib_data)
+ {
+ /* Skip user attributes. */
+ if (uid)
+ break;
+ continue;
+ }
+
/* If the user id is revoked or expired, then skip it. */
if (user_id->is_revoked || user_id->is_expired)
{