[git] GnuPG - branch, master, updated. gnupg-2.1.12-4-g693838f

[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  693838f0125d5d0c963fa3771b1bd117702af697 (commit)
       via  d33b35f7481caa0dcb25f9fa7d6c5bb27895297a (commit)
      from  ff870d59f067d3c5415e231c02a50d5dceac7e48 (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 693838f0125d5d0c963fa3771b1bd117702af697
Author: Werner Koch <wk at gnupg.org>
Date:   Mon May 9 21:07:40 2016 +0200

    gpg: Fix buglet in the check_all_keysigs function.
    
    * g10/keyedit.c (sig_comparison): Actually compare the pubkey
    algorithms.
    --
    
    This fixes two bugs: The first was a typo which led to us comparing A
    with A.  The second problem was the use of an assert at a place where
    this can't be asserted: Two signature may have different algorithms;
    they won't verify but after all it is about corrupted signatures.
    
    Reported-by: Guilhem Moulin <guilhem at fripost.org>
    GnuPG-bug-id: 2236
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keyedit.c b/g10/keyedit.c
index 7ddf342..200a1ab 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -350,8 +350,9 @@ sig_comparison (const void *av, const void *bv)
     return 1;
 
   ndataa = pubkey_get_nsig (a->pubkey_algo);
-  ndatab = pubkey_get_nsig (a->pubkey_algo);
-  log_assert (ndataa == ndatab);
+  ndatab = pubkey_get_nsig (b->pubkey_algo);
+  if (ndataa != ndatab)
+    return (ndataa < ndatab)? -1 : 1;
 
   for (i = 0; i < ndataa; i ++)
     {

commit d33b35f7481caa0dcb25f9fa7d6c5bb27895297a
Author: Werner Koch <wk at gnupg.org>
Date:   Mon May 9 20:57:20 2016 +0200

    gpg: Request a "save" after cmd "check" fixed something.
    
    * g10/keyedit.c (keyedit_menu) <cmdCHECK>: Set modified.
    --
    
    Reported-by: Guilhem Moulin <guilhem at fripost.org>
    GnuPG-bug-id: 2236
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keyedit.c b/g10/keyedit.c
index 5461864..7ddf342 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -2206,8 +2206,9 @@ keyedit_menu (ctrl_t ctrl, const char *username, strlist_t locusr,
 	  break;
 
 	case cmdCHECK:
-	  check_all_keysigs (keyblock, count_selected_uids (keyblock),
-                             !strcmp (arg_string, "selfsig"));
+	  if (check_all_keysigs (keyblock, count_selected_uids (keyblock),
+                                 !strcmp (arg_string, "selfsig")))
+            modified = 1;
 	  break;
 
 	case cmdSIGN:

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

Summary of changes:
 g10/keyedit.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)


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