[git] GnuPG - branch, master, updated. gnupg-2.1.0beta3-128-g60c5876
by Christian Aistleitner
cvs at cvs.gnupg.org
Fri Jan 11 13:56:56 CET 2013
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 60c58766aeb847b769372fa981f79abac6014500 (commit)
via 7a638c094fa1aa7ed1d9caf085af9980a2664d64 (commit)
from 4dddf32c83f52483d95d7770232e9e808558e702 (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 60c58766aeb847b769372fa981f79abac6014500
Author: Christian Aistleitner <christian at quelltextlich.at>
Date: Sun Oct 14 20:30:20 2012 +0200
gpg: Fix honoring --cert-digest-algo when recreating a cert
* g10/sign.c (update_keysig_packet): Override original signature's
digest algo in hashed data and for hash computation.
diff --git a/g10/sign.c b/g10/sign.c
index 6ff7df6..501f1ff 100644
--- a/g10/sign.c
+++ b/g10/sign.c
@@ -1604,6 +1604,8 @@ update_keysig_packet( PKT_signature **ret_sig,
/* create a new signature packet */
sig = copy_signature (NULL, orig_sig);
+ sig->digest_algo=digest_algo;
+
/* We need to create a new timestamp so that new sig expiration
calculations are done correctly... */
sig->timestamp=make_timestamp();
commit 7a638c094fa1aa7ed1d9caf085af9980a2664d64
Author: Werner Koch <wk at gnupg.org>
Date: Mon Jan 7 09:58:35 2013 +0100
Fix spurious cruft from configure summary output.
* configure.ac (build_scdaemon_extra): Remove $tmp cruft.
diff --git a/configure.ac b/configure.ac
index db51121..5881df1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1519,7 +1519,7 @@ fi
build_scdaemon_extra=""
if test "$build_scdaemon" = "yes"; then
if test $have_libusb = no; then
- build_scdaemon_extra="${tmp}without internal CCID driver"
+ build_scdaemon_extra="without internal CCID driver"
fi
if test -n "$build_scdaemon_extra"; then
build_scdaemon_extra="(${build_scdaemon_extra})"
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 2 +-
g10/sign.c | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list