aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--g10/ChangeLog3
-rw-r--r--g10/mainproc.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index bb3101ebd..55f386e63 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,8 @@
2002-11-24 David Shaw <[email protected]>
+ * 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,
diff --git a/g10/mainproc.c b/g10/mainproc.c
index c07a377eb..49fd217cb 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -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;