[git] GnuPG - branch, master, updated. gnupg-2.2.7-290-g3a90efb
[email protected] (by Werner Koch) Fri, 30 Nov 2018 12:39:07 +0100
| Newsgroups | gmane.comp.encryption.gpg.cvs |
|---|---|
| Message-ID | <[email protected]> |
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 3a90efb7cf13532cc82b45c11a7abdadfe0c81f1 (commit)
via cd64af003d4b6b46b69dbd575f73d53359ae0bcc (commit)
from 47106ac435e891ced67f0ad9bb6b2ee12098c880 (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 3a90efb7cf13532cc82b45c11a7abdadfe0c81f1
Author: Werner Koch <[email protected]>
Date: Fri Nov 30 12:38:51 2018 +0100
scd: Add strerror to new error message.
* agent/call-scd.c (wait_child_thread): Add %s.
Signed-off-by: Werner Koch <[email protected]>
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 796e7d8..d0d4794 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -275,7 +275,7 @@ wait_child_thread (void *arg)
err = npth_mutex_unlock (&start_scd_lock);
if (err)
- log_error ("failed to release the start_scd lock after waitpid",
+ log_error ("failed to release the start_scd lock after waitpid: %s\n",
strerror (err));
}
commit cd64af003d4b6b46b69dbd575f73d53359ae0bcc
Author: Werner Koch <[email protected]>
Date: Fri Nov 30 12:35:37 2018 +0100
gpg: Improve error message about failed keygrip computation.
* g10/keyid.c (keygrip_from_pk): Print the fingerprint on failure.
Signed-off-by: Werner Koch <[email protected]>
diff --git a/g10/keyid.c b/g10/keyid.c
index a9034ee..3694c26 100644
--- a/g10/keyid.c
+++ b/g10/keyid.c
@@ -975,7 +975,12 @@ keygrip_from_pk (PKT_public_key *pk, unsigned char *array)
if (!gcry_pk_get_keygrip (s_pkey, array))
{
- log_info ("error computing keygrip\n");
+ char *hexfpr;
+
+ hexfpr = hexfingerprint (pk, NULL, 0);
+ log_info ("error computing keygrip (fpr=%s)\n", hexfpr);
+ xfree (hexfpr);
+
memset (array, 0, 20);
err = gpg_error (GPG_ERR_GENERAL);
}
-----------------------------------------------------------------------
Summary of changes:
agent/call-scd.c | 2 +-
g10/keyid.c | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org