[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-39-g2b3cb2e

[by David Shaw]

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  2b3cb2ee94625498e7a7f939216c9bcddef6ec20 (commit)
      from  bdde44ae8d4709e33c09781c3d37a5da2c7a5e0d (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 2b3cb2ee94625498e7a7f939216c9bcddef6ec20
Author: David Shaw <dshaw at jabberwocky.com>
Date:   Tue Jan 31 21:30:05 2012 -0500

    Honor --cert-digest-algo when recreating a cert.
    
    * g10/sign.c (update_keysig_packet): Honor --cert-digest-algo when
      recreating a cert.
    
    This is used by various things in --edit-key like setpref, primary,
    etc.  Suggested by Christian Aistleitner.

diff --git a/g10/sign.c b/g10/sign.c
index 4cc813c..b2c8f0e 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -1,6 +1,6 @@
 /* sign.c - sign data
  * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
- *               2007, 2010 Free Software Foundation, Inc.
+ *               2007, 2010, 2012 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -1576,7 +1576,7 @@ update_keysig_packet( PKT_signature **ret_sig,
                       void *opaque)
 {
     PKT_signature *sig;
-    int rc=0;
+    int rc=0, digest_algo;
     gcry_md_hd_t md;
 
     if ((!orig_sig || !pk || !pksk)
@@ -1584,6 +1584,11 @@ update_keysig_packet( PKT_signature **ret_sig,
 	|| (orig_sig->sig_class == 0x18 && !subpk))
       return G10ERR_GENERAL;
 
+    if ( opt.cert_digest_algo )
+      digest_algo = opt.cert_digest_algo;
+    else
+      digest_algo = orig_sig->digest_algo;
+
     if ( gcry_md_open (&md, orig_sig->digest_algo, 0 ) )
       BUG ();
 

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

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


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