mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* 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. * 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:
parent
2cba999f22
commit
673894ef48
5 changed files with 54 additions and 5 deletions
|
@ -304,6 +304,13 @@ proc_symkey_enc( CTX c, PACKET *pkt )
|
|||
else
|
||||
log_error(_("encrypted with unknown algorithm %d\n"), algo );
|
||||
|
||||
if(check_digest_algo(enc->s2k.hash_algo))
|
||||
{
|
||||
log_error(_("passphrase generated with unknown digest"
|
||||
" algorithm %d\n"),enc->s2k.hash_algo);
|
||||
s=NULL;
|
||||
}
|
||||
|
||||
c->last_was_session_key = 2;
|
||||
if(!s || opt.list_only)
|
||||
goto leave;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue