security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-21 14:47:03 +01:00
Code Activity

* keyedit.c (sign_uids): Properly handle remaking a self-sig on revoked or

Browse Source 
expired user IDs.  Also, once we've established that a given uid cannot or
will not be signed, don't continue to ask about each sig.
This commit is contained in:
David Shaw 2004-06-24 03:52:18 +00:00
parent 4f061d3710
commit 7c90cacd33
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2004-06-23 David Shaw <dshaw@jabberwocky.com>
* keyedit.c (sign_uids): Properly handle remaking a self-sig on
revoked or expired user IDs. Also, once we've established that a
given uid cannot or will not be signed, don't continue to ask
about each sig.
2004-06-18 David Shaw <dshaw@jabberwocky.com> 2004-06-18 David Shaw <dshaw@jabberwocky.com>
* status.h, status.c (get_status_string), plaintext.c * status.h, status.c (get_status_string), plaintext.c

20
g10/keyedit.c
View File

@ -361,7 +361,9 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
{ {
tty_printf(_("User ID \"%s\" is revoked."),user); tty_printf(_("User ID \"%s\" is revoked."),user);
if(opt.expert) if(selfsig)
tty_printf("\n");
else if(opt.expert)
{ {
tty_printf("\n"); tty_printf("\n");
/* No, so remove the mark and continue */ /* No, so remove the mark and continue */
@ -369,11 +371,15 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
_("Are you sure you " _("Are you sure you "
"still want to sign " "still want to sign "
"it? (y/N) "))) "it? (y/N) ")))
{
uidnode->flag &= ~NODFLG_MARK_A; uidnode->flag &= ~NODFLG_MARK_A;
uidnode=NULL;
}
} }
else else
{ {
uidnode->flag &= ~NODFLG_MARK_A; uidnode->flag &= ~NODFLG_MARK_A;
uidnode=NULL;
tty_printf(_(" Unable to sign.\n")); tty_printf(_(" Unable to sign.\n"));
} }
} }
@ -381,7 +387,9 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
{ {
tty_printf(_("User ID \"%s\" is expired."),user); tty_printf(_("User ID \"%s\" is expired."),user);
if(opt.expert) if(selfsig)
tty_printf("\n");
else if(opt.expert)
{ {
tty_printf("\n"); tty_printf("\n");
/* No, so remove the mark and continue */ /* No, so remove the mark and continue */
@ -389,11 +397,15 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
_("Are you sure you " _("Are you sure you "
"still want to sign " "still want to sign "
"it? (y/N) "))) "it? (y/N) ")))
{
uidnode->flag &= ~NODFLG_MARK_A; uidnode->flag &= ~NODFLG_MARK_A;
uidnode=NULL;
}
} }
else else
{ {
uidnode->flag &= ~NODFLG_MARK_A; uidnode->flag &= ~NODFLG_MARK_A;
uidnode=NULL;
tty_printf(_(" Unable to sign.\n")); tty_printf(_(" Unable to sign.\n"));
} }
} }
@ -410,11 +422,15 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
_("Are you sure you " _("Are you sure you "
"still want to sign " "still want to sign "
"it? (y/N) "))) "it? (y/N) ")))
{
uidnode->flag &= ~NODFLG_MARK_A; uidnode->flag &= ~NODFLG_MARK_A;
uidnode=NULL;
}
} }
else else
{ {
uidnode->flag &= ~NODFLG_MARK_A; uidnode->flag &= ~NODFLG_MARK_A;
uidnode=NULL;
tty_printf(_(" Unable to sign.\n")); tty_printf(_(" Unable to sign.\n"));
} }
} }