[git] GnuPG - branch, master, updated. gnupg-2.2.1-25-g18e5946

[by Werner Koch]

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  18e5946aef458cd95fdce4a04e144747b52b0472 (commit)
      from  825abec0e7f38667a34dce3025fc2f3a05001dde (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 18e5946aef458cd95fdce4a04e144747b52b0472
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 18 13:55:56 2017 +0200

    gpg: Fix wrong Tofu DB consistency check.
    
    * g10/tofu.c (build_conflict_set): Do not assume MAX_FINGERPRINT_LEN
    is the size of the fingerprint.
    --
    
    This problem was exhibited by
    commit ecbbafb88d920e713439b6b1b8e1b41a6f8d0e38.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/tofu.c b/g10/tofu.c
index ddd7f8c..e63e989 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2083,13 +2083,16 @@ build_conflict_set (ctrl_t ctrl, tofu_dbs_t dbs,
    * policy to ask due to a conflict.  */
   for (iter = conflict_set; iter; iter = iter->next)
     {
+      /* Fixme: Why the check against N+1?  */
       int l = strlen (iter->d);
-      if (!(l == 2 * MAX_FINGERPRINT_LEN
-            || l == 2 * MAX_FINGERPRINT_LEN + 1))
+      if (!(l == 2 * 20
+            || l == 2 * 20 + 1
+            || l == 2 * 32
+            || l == 2 * 32 + 1))
         {
           log_error (_("TOFU db corruption detected.\n"));
-          print_further_info ("fingerprint '%s' is not %d characters long",
-                              iter->d, 2 * MAX_FINGERPRINT_LEN);
+          print_further_info ("fingerprint '%s' is %d characters long",
+                              iter->d, l);
         }
 
       if (l >= 1 && iter->d[l - 1] == '!')

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

Summary of changes:
 g10/tofu.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)


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