mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
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
This commit is contained in:
parent
a5527edebb
commit
85d8fa57db
@ -4867,6 +4867,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
|
||||
@ -4892,6 +4893,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));
|
||||
|
@ -4062,6 +4062,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);
|
||||
|
Loading…
x
Reference in New Issue
Block a user