[Pkg-gnupg-commit] [gnupg2] 71/118: g10: Don't add user attributes to the TOFU DB.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch encoding-and-speling
in repository gnupg2.

commit 9082bde01cc18e32504ce39d55ea6dd3c05dddec
Author: Neal H. Walfield <neal at g10code.com>
Date:   Mon Sep 5 16:44:09 2016 +0200

    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 <neal at g10code.com>
---
 g10/trustdb.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/g10/trustdb.c b/g10/trustdb.c
index 4181240..6f63c34 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)
             {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git