diff options
| author | David Shaw <[email protected]> | 2002-11-24 00:50:14 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-11-24 00:50:14 +0000 |
| commit | 0cd879cd9c8ef9363aa97e3d30090bd06fc3d215 (patch) | |
| tree | 06b085f8c8adfd330b269c374c0a5a60827ddb9d /g10/passphrase.c | |
| parent | * gpg.sgml: Add an interoperability section. (diff) | |
| download | gnupg-0cd879cd9c8ef9363aa97e3d30090bd06fc3d215.tar.gz gnupg-0cd879cd9c8ef9363aa97e3d30090bd06fc3d215.zip | |
* encode.c (encode_simple), passphrase.c (passphrase_to_dek), sign.c
(sign_symencrypt_file): Use --s2k-digest-algo for passphrase mangling
rather than --digest-algo.
Diffstat (limited to 'g10/passphrase.c')
| -rw-r--r-- | g10/passphrase.c | 5 |
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() ) { |