diff options
| author | David Shaw <[email protected]> | 2004-07-15 21:16:54 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-07-15 21:16:54 +0000 |
| commit | 673894ef48b74ad654e03f55804ac61e6bdce6da (patch) | |
| tree | 5e1873d94d397f44007595da106c1e51f567f2a6 /g10/mainproc.c | |
| parent | * g10.c (main): Alias --charset as --display-charset to help avoid the (diff) | |
| download | gnupg-673894ef48b74ad654e03f55804ac61e6bdce6da.tar.gz gnupg-673894ef48b74ad654e03f55804ac61e6bdce6da.zip | |
* 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.
Diffstat (limited to '')
| -rw-r--r-- | g10/mainproc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/g10/mainproc.c b/g10/mainproc.c index d2061e30e..5258d57ca 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -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; |