security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02: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.

* mainproc.c (proc_symkey_enc), seckey-cert.c (do_check): Check the S2K
hash algorithm before we try to generate a passphrase using it.  This
prevents hitting BUG() when generating a passphrase using a hash that we
don't have.

* sign.c (sign_symencrypt_file): Allow using --force-mdc in --sign
--symmetric messages.
This commit is contained in:
David Shaw 2004-07-15 21:16:54 +00:00
parent 2cba999f22
commit 673894ef48
5 changed files with 54 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
g10/keyedit.c
View file

@ -492,7 +492,9 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
{
tty_printf(_("User ID \"%s\" is revoked."),user);
if(opt.expert)
if(selfsig)
tty_printf("\n");
else if(opt.expert)
{
tty_printf("\n");
/* No, so remove the mark and continue */
@ -500,11 +502,15 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
_("Are you sure you "
"still want to sign "
"it? (y/N) ")))
uidnode->flag &= ~NODFLG_MARK_A;
{
uidnode->flag &= ~NODFLG_MARK_A;
uidnode=NULL;
}
}
else
{
uidnode->flag &= ~NODFLG_MARK_A;
uidnode=NULL;
tty_printf(_(" Unable to sign.\n"));
}
}
@ -512,7 +518,9 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
{
tty_printf(_("User ID \"%s\" is expired."),user);
if(opt.expert)
if(selfsig)
tty_printf("\n");
else if(opt.expert)
{
tty_printf("\n");
/* No, so remove the mark and continue */
@ -520,11 +528,15 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
_("Are you sure you "
"still want to sign "
"it? (y/N) ")))
uidnode->flag &= ~NODFLG_MARK_A;
{
uidnode->flag &= ~NODFLG_MARK_A;
uidnode=NULL;
}
}
else
{
uidnode->flag &= ~NODFLG_MARK_A;
uidnode=NULL;
tty_printf(_(" Unable to sign.\n"));
}
}
@ -541,11 +553,15 @@ sign_uids( KBNODE keyblock, STRLIST locusr, int *ret_modified,
_("Are you sure you "
"still want to sign "
"it? (y/N) ")))
uidnode->flag &= ~NODFLG_MARK_A;
{
uidnode->flag &= ~NODFLG_MARK_A;
uidnode=NULL;
}
}
else
{
uidnode->flag &= ~NODFLG_MARK_A;
uidnode=NULL;
tty_printf(_(" Unable to sign.\n"));
}
}