[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.18-18-g258192d

[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, STABLE-BRANCH-2-0 has been updated
       via  258192d4d453e27c4c54dbeefaae901ef94b5f4b (commit)
      from  4a9d69ca87d4e21b015b7ceab6b2b6ba3809ec22 (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 258192d4d453e27c4c54dbeefaae901ef94b5f4b
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 94e107c..8d280ed 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 Free Software Foundation, Inc.
+ *               2007, 2010, 2012 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -1504,7 +1504,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 || !sk)
@@ -1512,6 +1512,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