[git] GnuPG - branch, master, updated. gnupg-2.1.10-146-gb8bb16c

[by NIIBE Yutaka]

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  b8bb16c6c08d3c2947f1ff67419b36eb203c5c1a (commit)
       via  d33a34004bef028068538f099c32a0e292a004c3 (commit)
      from  fbe1cf67aadc5a33cf815ddbcfc9669e43caa123 (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 b8bb16c6c08d3c2947f1ff67419b36eb203c5c1a
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Jan 26 11:12:33 2016 +0900

    g10: Fix segfault on unsupported curve.
    
    * g10/call-agent.c (learn_status_cb): Don't use NULL for strcmp.
    --
    
    With libgcrypt not supporting cv25519, gpg segfaults.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/g10/call-agent.c b/g10/call-agent.c
index 1d7ff57..d9e4859 100644
--- a/g10/call-agent.c
+++ b/g10/call-agent.c
@@ -701,14 +701,10 @@ learn_status_cb (void *opaque, const char *line)
         {
           const char *curve;
 
-          i = 0;
-          do
-            {
-              curve = openpgp_enum_curves (&i);
-              if (!strcmp (curve, line+n))
-                break;
-            }
-          while (curve != NULL);
+          for (i = 0; (curve = openpgp_enum_curves (&i));)
+            if (!strcmp (curve, line+n))
+              break;
+
           parm->key_attr[keyno].curve = curve;
         }
     }

commit d33a34004bef028068538f099c32a0e292a004c3
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Tue Jan 26 11:00:53 2016 +0900

    sm: small fix for GCC 6.
    
    * sm/export.c (insert_duptable): Use unsigned 0.
    
    --
    
    We can silence message with -Wshift-negative-value.
    
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>

diff --git a/sm/export.c b/sm/export.c
index 1dce106..d3dc9b9 100644
--- a/sm/export.c
+++ b/sm/export.c
@@ -103,7 +103,7 @@ insert_duptable (duptable_t *table, unsigned char *fpr, int *exists)
 #error cannot handle a table larger than 16 bits or smaller than 8 bits
 #elif DUPTABLE_BITS > 8
   idx <<= (DUPTABLE_BITS - 8);
-  idx |= (fpr[1] & ~(~0 << 4));
+  idx |= (fpr[1] & ~(~0U << 4));
 #endif
 
   for (t = table[idx]; t; t = t->next)

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

Summary of changes:
 g10/call-agent.c | 12 ++++--------
 sm/export.c      |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)


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