[git] GnuPG - branch, master, updated. gnupg-2.1.10-21-g25f0f05

[by Justus Winter]

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  25f0f053cd306200a6211b5cf397838a59835ee7 (commit)
       via  b78fce327101390685a4dc2f59fb1607b7cd6d0b (commit)
       via  d6e01493cad6ff32f356185c7a2d2b5c2b86a937 (commit)
      from  6dc37c5fb60acbfd5ba2ab979852383eac8944e0 (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 25f0f053cd306200a6211b5cf397838a59835ee7
Author: Justus Winter <justus at g10code.com>
Date:   Fri Dec 11 11:05:52 2015 +0100

    agent: Improve error handling.
    
    * agent/pksign.c (agent_pksign_do): Improve error handling.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/agent/pksign.c b/agent/pksign.c
index f64729c..7b498d4 100644
--- a/agent/pksign.c
+++ b/agent/pksign.c
@@ -505,7 +505,8 @@ agent_pksign_do (ctrl_t ctrl, const char *cache_nonce,
                                ctrl->digest.raw_value);
         }
 
-      rc = gcry_pk_verify (s_sig, s_hash, s_pkey? s_pkey: s_skey);
+      if (! rc)
+        rc = gcry_pk_verify (s_sig, s_hash, s_pkey? s_pkey: s_skey);
 
       if (rc)
         {

commit b78fce327101390685a4dc2f59fb1607b7cd6d0b
Author: Justus Winter <justus at g10code.com>
Date:   Fri Dec 11 11:03:16 2015 +0100

    agent: Fix typo.
    
    --
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/agent/pksign.c b/agent/pksign.c
index e079c3f..f64729c 100644
--- a/agent/pksign.c
+++ b/agent/pksign.c
@@ -281,7 +281,7 @@ do_encode_raw_pkcs1 (const byte *md, size_t mdlen, unsigned int nbits,
    passphrase.  If OVERRIDEDATA is not NULL, OVERRIDEDATALEN bytes
    from this buffer are used instead of the data in CTRL.  The
    override feature is required to allow the use of Ed25519 with ssh
-   because Ed25519 dies the hashing itself.  */
+   because Ed25519 does the hashing itself.  */
 int
 agent_pksign_do (ctrl_t ctrl, const char *cache_nonce,
                  const char *desc_text,

commit d6e01493cad6ff32f356185c7a2d2b5c2b86a937
Author: Justus Winter <justus at g10code.com>
Date:   Thu Dec 10 10:47:09 2015 +0100

    Fix required libgpg-error version.
    
    * configure.ac (NEED_GPG_ERROR_VERSION): We need version 1.21 for the
    poll interface.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/configure.ac b/configure.ac
index 09b15ea..5a75e50 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist))
 m4_esyscmd([echo ]mym4_version[>VERSION])
 AC_INIT([mym4_package],[mym4_version], [http://bugs.gnupg.org])
 
-NEED_GPG_ERROR_VERSION=1.16
+NEED_GPG_ERROR_VERSION=1.21
 
 NEED_LIBGCRYPT_API=1
 NEED_LIBGCRYPT_VERSION=1.6.0

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

Summary of changes:
 agent/pksign.c | 5 +++--
 configure.ac   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)


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