[Pkg-gnupg-commit] [gnupg2] 204/205: include two simple fixes from upstream

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 76f1eddcd136d592d403e6c88271a0ad77648c41
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Tue May 10 23:02:07 2016 -0400

    include two simple fixes from upstream
---
 ...st-a-save-after-cmd-check-fixed-something.patch | 30 ++++++++++++++++++
 ...-buglet-in-the-check_all_keysigs-function.patch | 36 ++++++++++++++++++++++
 debian/patches/series                              |  2 ++
 3 files changed, 68 insertions(+)

diff --git a/debian/patches/0003-gpg-Request-a-save-after-cmd-check-fixed-something.patch b/debian/patches/0003-gpg-Request-a-save-after-cmd-check-fixed-something.patch
new file mode 100644
index 0000000..31411a6
--- /dev/null
+++ b/debian/patches/0003-gpg-Request-a-save-after-cmd-check-fixed-something.patch
@@ -0,0 +1,30 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Mon, 9 May 2016 20:57:20 +0200
+Subject: 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>
+---
+ g10/keyedit.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+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:
diff --git a/debian/patches/0004-gpg-Fix-buglet-in-the-check_all_keysigs-function.patch b/debian/patches/0004-gpg-Fix-buglet-in-the-check_all_keysigs-function.patch
new file mode 100644
index 0000000..511987f
--- /dev/null
+++ b/debian/patches/0004-gpg-Fix-buglet-in-the-check_all_keysigs-function.patch
@@ -0,0 +1,36 @@
+From: Werner Koch <wk at gnupg.org>
+Date: Mon, 9 May 2016 21:07:40 +0200
+Subject: 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>
+---
+ g10/keyedit.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+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 ++)
+     {
diff --git a/debian/patches/series b/debian/patches/series
index f3de40b..1fa584c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 0002-avoid-beta-warning.patch
 0003-Avoid-simple-memory-dumps-via-ptrace.patch
+0003-gpg-Request-a-save-after-cmd-check-fixed-something.patch
+0004-gpg-Fix-buglet-in-the-check_all_keysigs-function.patch

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