aboutsummaryrefslogtreecommitdiffstats
path: root/g10/passphrase.c
diff options
context:
space:
mode:
Diffstat (limited to 'g10/passphrase.c')
-rw-r--r--g10/passphrase.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 77fa15cc3..ac3f0311e 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -956,12 +956,9 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo,
if( !s2k ) {
/* This is used for the old rfc1991 mode
* Note: This must match the code in encode.c with opt.rfc1991 set */
- int algo = opt.def_digest_algo ? opt.def_digest_algo
- : opt.s2k_digest_algo;
-
s2k = &help_s2k;
s2k->mode = 0;
- s2k->hash_algo = algo;
+ s2k->hash_algo = opt.s2k_digest_algo;
}
if( !next_pw && is_status_enabled() ) {