[git] GnuPG - branch, master, updated. gnupg-2.1.15-71-g9082bde

[by Neal H. Walfield]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  9082bde01cc18e32504ce39d55ea6dd3c05dddec (commit)
      from  0b99d1fd2a80b8efaacc731027d2b2ecd9eca699 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
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>

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)
             {

-----------------------------------------------------------------------

Summary of changes:
 g10/trustdb.c | 8 ++++++++
 1 file changed, 8 insertions(+)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org