[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-119-gd61f740

[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  d61f7402f2b0f6dd288e403ed9408fd65e617f85 (commit)
      from  8325d616593187ff227853de0295e3269b96edcb (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 d61f7402f2b0f6dd288e403ed9408fd65e617f85
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Dec 19 11:47:23 2012 +0100

    gpg: Make commit 2b3cb2ee actually work
    
    * g10/sign.c (update_keysig_packet): Use digest_algo.
    
    (cherry-picked from commit d23ec86095714d388acac14b515445fe69f019e9)

diff --git a/g10/sign.c b/g10/sign.c
index 6238ce8..6ff7df6 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -1576,7 +1576,8 @@ update_keysig_packet( PKT_signature **ret_sig,
                       void *opaque)
 {
     PKT_signature *sig;
-    int rc=0, digest_algo;
+    int rc = 0;
+    int digest_algo;
     gcry_md_hd_t md;
 
     if ((!orig_sig || !pk || !pksk)
@@ -1589,7 +1590,7 @@ update_keysig_packet( PKT_signature **ret_sig,
     else
       digest_algo = orig_sig->digest_algo;
 
-    if ( gcry_md_open (&md, orig_sig->digest_algo, 0 ) )
+    if ( gcry_md_open (&md, digest_algo, 0 ) )
       BUG ();
 
     /* Hash the public key certificate and the user id. */

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

Summary of changes:
 g10/sign.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


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