security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpg: Emit status error for an invalid ADSK.

Browse Source 
* g10/keygen.c (prepare_adsk): Emit status error.
--

This is useful for GPGME.

GnuPG-bug-id: 7322
This commit is contained in:
Werner Koch 2024-10-07 08:16:31 +02:00
parent f8f6c6c761
commit e8858807bc
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
g10/keyedit.c
View File

@ -5044,6 +5044,7 @@ menu_addadsk (ctrl_t ctrl, kbnode_t pub_keyblock, const char *adskfpr)
NULL, adsk_pk, answer, &adsk_keyblock, NULL, 1); NULL, adsk_pk, answer, &adsk_keyblock, NULL, 1);
if (err) if (err)
{ {
write_status_error ("add_adsk", err);
log_info (_("key \"%s\" not found: %s\n"), answer, log_info (_("key \"%s\" not found: %s\n"), answer,
gpg_strerror (err)); gpg_strerror (err));
if ((!opt.batch || adskfpr) && !opt.quiet if ((!opt.batch || adskfpr) && !opt.quiet
@ -5069,6 +5070,7 @@ menu_addadsk (ctrl_t ctrl, kbnode_t pub_keyblock, const char *adskfpr)
} }
if (!node) if (!node)
{ {
write_status_error ("add_adsk", err);
err = gpg_error (GPG_ERR_WRONG_KEY_USAGE); err = gpg_error (GPG_ERR_WRONG_KEY_USAGE);
log_info (_("key \"%s\" not found: %s\n"), answer, log_info (_("key \"%s\" not found: %s\n"), answer,
gpg_strerror (err)); gpg_strerror (err));

1
g10/keygen.c
View File

@ -4665,6 +4665,7 @@ prepare_adsk (ctrl_t ctrl, const char *name)
{ {
if (namebuffer && (p=strchr (namebuffer, '!'))) if (namebuffer && (p=strchr (namebuffer, '!')))
*p = 0; /* Strip the ! for the diagnostic. */ *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)); log_error ("invalid ADSK '%s' specified: %s\n", name, gpg_strerror (err));
} }
free_public_key (adsk_pk); free_public_key (adsk_pk);