mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
gpg: Emit ERROR status for key signing failures.
* g10/keyedit.c (sign_uids): Write an ERROR status for a signing failure. (menu_adduid, menu_addrevoker, menu_revsig): Ditto. (menu_revuid, menu_revkey, menu_revsubkey): Ditto. -- This change helps GPA to show better error messages. Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
9cdff09743
commit
51b9b8fba4
@ -1041,6 +1041,7 @@ sign_uids (ctrl_t ctrl, estream_t fp,
|
|||||||
NULL);
|
NULL);
|
||||||
if (rc)
|
if (rc)
|
||||||
{
|
{
|
||||||
|
write_status_error ("keysig", rc);
|
||||||
log_error (_("signing failed: %s\n"), gpg_strerror (rc));
|
log_error (_("signing failed: %s\n"), gpg_strerror (rc));
|
||||||
goto leave;
|
goto leave;
|
||||||
}
|
}
|
||||||
@ -3497,6 +3498,7 @@ menu_adduid (kbnode_t pub_keyblock, int photo, const char *photo_name,
|
|||||||
keygen_add_std_prefs, pk, NULL);
|
keygen_add_std_prefs, pk, NULL);
|
||||||
if (err)
|
if (err)
|
||||||
{
|
{
|
||||||
|
write_status_error ("keysig", err);
|
||||||
log_error ("signing failed: %s\n", gpg_strerror (err));
|
log_error ("signing failed: %s\n", gpg_strerror (err));
|
||||||
free_user_id (uid);
|
free_user_id (uid);
|
||||||
return 0;
|
return 0;
|
||||||
@ -3881,6 +3883,7 @@ menu_addrevoker (ctrl_t ctrl, kbnode_t pub_keyblock, int sensitive)
|
|||||||
keygen_add_revkey, &revkey, NULL);
|
keygen_add_revkey, &revkey, NULL);
|
||||||
if (rc)
|
if (rc)
|
||||||
{
|
{
|
||||||
|
write_status_error ("keysig", rc);
|
||||||
log_error ("signing failed: %s\n", gpg_strerror (rc));
|
log_error ("signing failed: %s\n", gpg_strerror (rc));
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
@ -5172,6 +5175,7 @@ reloop: /* (must use this, because we are modifing the list) */
|
|||||||
free_public_key (signerkey);
|
free_public_key (signerkey);
|
||||||
if (rc)
|
if (rc)
|
||||||
{
|
{
|
||||||
|
write_status_error ("keysig", rc);
|
||||||
log_error (_("signing failed: %s\n"), gpg_strerror (rc));
|
log_error (_("signing failed: %s\n"), gpg_strerror (rc));
|
||||||
release_revocation_reason_info (reason);
|
release_revocation_reason_info (reason);
|
||||||
return changed;
|
return changed;
|
||||||
@ -5263,6 +5267,7 @@ menu_revuid (KBNODE pub_keyblock)
|
|||||||
sign_mk_attrib, &attrib, NULL);
|
sign_mk_attrib, &attrib, NULL);
|
||||||
if (rc)
|
if (rc)
|
||||||
{
|
{
|
||||||
|
write_status_error ("keysig", rc);
|
||||||
log_error (_("signing failed: %s\n"), gpg_strerror (rc));
|
log_error (_("signing failed: %s\n"), gpg_strerror (rc));
|
||||||
goto leave;
|
goto leave;
|
||||||
}
|
}
|
||||||
@ -5327,6 +5332,7 @@ menu_revkey (KBNODE pub_keyblock)
|
|||||||
revocation_reason_build_cb, reason, NULL);
|
revocation_reason_build_cb, reason, NULL);
|
||||||
if (rc)
|
if (rc)
|
||||||
{
|
{
|
||||||
|
write_status_error ("keysig", rc);
|
||||||
log_error (_("signing failed: %s\n"), gpg_strerror (rc));
|
log_error (_("signing failed: %s\n"), gpg_strerror (rc));
|
||||||
goto scram;
|
goto scram;
|
||||||
}
|
}
|
||||||
@ -5388,6 +5394,7 @@ menu_revsubkey (KBNODE pub_keyblock)
|
|||||||
NULL);
|
NULL);
|
||||||
if (rc)
|
if (rc)
|
||||||
{
|
{
|
||||||
|
write_status_error ("keysig", rc);
|
||||||
log_error (_("signing failed: %s\n"), gpg_strerror (rc));
|
log_error (_("signing failed: %s\n"), gpg_strerror (rc));
|
||||||
release_revocation_reason_info (reason);
|
release_revocation_reason_info (reason);
|
||||||
return changed;
|
return changed;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user