aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2024-10-07 06:16:31 +0000
committerWerner Koch <[email protected]>2024-10-07 06:25:56 +0000
commita8b503c42bd4a773c6a9f88f553138d8092eec4d (patch)
treea67aeb864951291c76af52965f9265fdbe608ec5
parentgpg: Exclude expired trusted keys from the key validation process. (diff)
downloadgnupg-a8b503c42bd4a773c6a9f88f553138d8092eec4d.tar.gz
gnupg-a8b503c42bd4a773c6a9f88f553138d8092eec4d.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
-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 45a1a2414..754f23a38 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -5043,6 +5043,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
@@ -5068,6 +5069,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 a1143182c..fda595793 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -4282,6 +4282,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);