aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2024-10-07 06:16:31 +0000
committerWerner Koch <[email protected]>2024-10-07 06:24:04 +0000
commite8858807bcafea9f996dae260443df41e7c8ac11 (patch)
tree89277e5dcc71f328062b8e92d2dd025656280d3f /g10
parentgpgsm: Add compatibility flag no-keyinfo-cache (diff)
downloadgnupg-e8858807bcafea9f996dae260443df41e7c8ac11.tar.gz
gnupg-e8858807bcafea9f996dae260443df41e7c8ac11.zip
gpg: Emit status error for an invalid ADSK.
* g10/keygen.c (prepare_adsk): Emit status error. -- This is useful for GPGME. GnuPG-bug-id: 7322
Diffstat (limited to 'g10')
-rw-r--r--g10/keyedit.c2
-rw-r--r--g10/keygen.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c
index a8d3ec685..b2018a2bd 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -5044,6 +5044,7 @@ menu_addadsk (ctrl_t ctrl, kbnode_t pub_keyblock, const char *adskfpr)
NULL, adsk_pk, answer, &adsk_keyblock, NULL, 1);
if (err)
{
+ write_status_error ("add_adsk", err);
log_info (_("key \"%s\" not found: %s\n"), answer,
gpg_strerror (err));
if ((!opt.batch || adskfpr) && !opt.quiet
@@ -5069,6 +5070,7 @@ menu_addadsk (ctrl_t ctrl, kbnode_t pub_keyblock, const char *adskfpr)
}
if (!node)
{
+ write_status_error ("add_adsk", err);
err = gpg_error (GPG_ERR_WRONG_KEY_USAGE);
log_info (_("key \"%s\" not found: %s\n"), answer,
gpg_strerror (err));
diff --git a/g10/keygen.c b/g10/keygen.c
index 453301fac..dafac87b6 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4665,6 +4665,7 @@ prepare_adsk (ctrl_t ctrl, const char *name)
{
if (namebuffer && (p=strchr (namebuffer, '!')))
*p = 0; /* Strip the ! for the diagnostic. */
+ write_status_error ("add_adsk", err);
log_error ("invalid ADSK '%s' specified: %s\n", name, gpg_strerror (err));
}
free_public_key (adsk_pk);