[git] GnuPG - branch, master, updated. gnupg-2.1.0-beta864-2-g3ae6afc

[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  3ae6afc1336d42bd95fa0b7f5f83bd299ae26b97 (commit)
      from  0c52bfa3955b629038a6ac42c48356b88fce181e (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 3ae6afc1336d42bd95fa0b7f5f83bd299ae26b97
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Oct 8 21:40:34 2014 +0200

    gpg: Avoid error exit if keygrip computations fails in a key listing.
    
    * g10/keyid.c (keygrip_from_pk): Use log_info and clear array on error.
    --
    
    This may happen due to algorithms or curves not supported by
    Libgcrypt.  We should only print a warning and not have gpg return
    with failure for a secret key listing.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/g10/keyid.c b/g10/keyid.c
index 94900bd..3b4c10c 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -854,7 +854,8 @@ keygrip_from_pk (PKT_public_key *pk, unsigned char *array)
 
   if (!gcry_pk_get_keygrip (s_pkey, array))
     {
-      log_error ("error computing keygrip\n");
+      log_info ("error computing keygrip\n");
+      memset (array, 0, 20);
       err = gpg_error (GPG_ERR_GENERAL);
     }
   else

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

Summary of changes:
 g10/keyid.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


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