[git] GnuPG - branch, master, updated. gnupg-2.1.15-40-g0cb0ea1

[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  0cb0ea1633955fb7acd33fe993a4ae4e96e83ae3 (commit)
       via  00c2850393ecc320f591f511c3534286964780c2 (commit)
      from  3e67b50490aef087b5769bb35145d23f6657780f (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 0cb0ea1633955fb7acd33fe993a4ae4e96e83ae3
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Sep 1 13:17:54 2016 +0200

    g10: Improve text.
    
    * g10/tofu.c (show_statistics): Improve the text (key and user id, not
    just key).
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index 14d361b..2161cee 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2281,10 +2281,10 @@ show_statistics (tofu_dbs_t dbs, const char *fingerprint,
 
 	      if (messages == 0)
 		log_info (_("Warning: we've have yet to see"
-                            " a message signed by this key!\n"));
+                            " a message signed by this key and user id!\n"));
 	      else if (messages == 1)
-		log_info (_("Warning: we've only seen a"
-                            " single message signed by this key!\n"));
+		log_info (_("Warning: we've only seen a single message"
+                            " signed by this key and user id!\n"));
 
 	      set_policy_command =
 		xasprintf ("gpg --tofu-policy bad %s", fingerprint);
@@ -2292,8 +2292,8 @@ show_statistics (tofu_dbs_t dbs, const char *fingerprint,
               tmpmsg = xasprintf
                 (ngettext
                  ("Warning: if you think you've seen more than %ld message "
-                  "signed by this key, then this key might be a forgery!  "
-                  "Carefully examine the email address for small "
+                  "signed by this key and user id, then this key might be a "
+                  "forgery!  Carefully examine the email address for small "
                   "variations.  If the key is suspect, then use\n"
                   "  %s\n"
                   "to mark it as being bad.\n",

commit 00c2850393ecc320f591f511c3534286964780c2
Author: Neal H. Walfield <neal at g10code.com>
Date:   Thu Sep 1 13:17:06 2016 +0200

    g10: Remove unused parameter.
    
    * g10/tofu.c (show_statistics): Remove unused parameter sig_exclude.
    Update callers.
    
    --
    Signed-off-by: Neal H. Walfield <neal at g10code.com>

diff --git a/g10/tofu.c b/g10/tofu.c
index de685a6..14d361b 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2108,7 +2108,7 @@ write_stats_status (estream_t fp, long messages, enum tofu_policy policy,
 static void
 show_statistics (tofu_dbs_t dbs, const char *fingerprint,
 		 const char *email, const char *user_id,
-		 const char *sig_exclude, estream_t outfp)
+		 estream_t outfp)
 {
   char *fingerprint_pp;
   int rc;
@@ -2122,13 +2122,8 @@ show_statistics (tofu_dbs_t dbs, const char *fingerprint,
      "select count (*), min (signatures.time), max (signatures.time)\n"
      " from signatures\n"
      " left join bindings on signatures.binding = bindings.oid\n"
-     " where fingerprint = %Q and email = %Q and sig_digest %s%s%s;",
-     fingerprint, email,
-     /* We want either: sig_digest != 'SIG_EXCLUDE' or sig_digest is
-	not NULL.  */
-     sig_exclude ? "!= '" : "is not NULL",
-     sig_exclude ? sig_exclude : "",
-     sig_exclude ? "'" : "");
+     " where fingerprint = %Q and email = %Q;",
+     fingerprint, email);
   if (rc)
     {
       log_error (_("error reading TOFU database: %s\n"), err);
@@ -2598,7 +2593,7 @@ tofu_write_tfs_record (ctrl_t ctrl, estream_t fp,
   fingerprint = hexfingerprint (pk, NULL, 0);
   email = email_from_user_id (user_id);
 
-  show_statistics (dbs, fingerprint, email, user_id, NULL, fp);
+  show_statistics (dbs, fingerprint, email, user_id, fp);
 
   xfree (email);
   xfree (fingerprint);
@@ -2669,7 +2664,7 @@ tofu_get_validity (ctrl_t ctrl, PKT_public_key *pk, strlist_t user_id_list,
         bindings_valid ++;
 
       if (may_ask && tl != TRUST_ULTIMATE && tl != TRUST_EXPIRED)
-        show_statistics (dbs, fingerprint, email, user_id->d, NULL, NULL);
+        show_statistics (dbs, fingerprint, email, user_id->d, NULL);
 
       if (tl == TRUST_NEVER)
         trust_level = TRUST_NEVER;

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

Summary of changes:
 g10/tofu.c | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)


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