* mainproc.c (proc_encrypted): Use --s2k-digest-algo for passphrase

mangling rather than --digest-algo.
This commit is contained in:
David Shaw 2002-11-25 04:11:02 +00:00
parent 8b9e9d33c1
commit bd23076c5e
2 changed files with 4 additions and 1 deletions

View File

@ -1,5 +1,8 @@
2002-11-24 David Shaw <dshaw@jabberwocky.com>
* mainproc.c (proc_encrypted): Use --s2k-digest-algo for
passphrase mangling rather than --digest-algo.
* sign.c (hash_for): If --digest-algo is not set, but
--personal-digest-preferences is, then use the first hash
algorithm in the personal list. If the signing algorithm is DSA,

View File

@ -477,7 +477,7 @@ proc_encrypted( CTX c, PACKET *pkt )
}
else {
algo = CIPHER_ALGO_IDEA;
if (!opt.def_digest_algo) {
if (!opt.s2k_digest_algo) {
/* If no digest is given we assume MD5 */
s2kbuf.mode = 0;
s2kbuf.hash_algo = DIGEST_ALGO_MD5;