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/encode.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 '')
| -rw-r--r-- | g10/encode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/g10/encode.c b/g10/encode.c index a814544e9..a2ca43fb1 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -192,8 +192,7 @@ encode_simple( const char *filename, int mode, int compat ) if( mode ) { s2k = m_alloc_clear( sizeof *s2k ); s2k->mode = opt.rfc1991? 0:opt.s2k_mode; - s2k->hash_algo = opt.def_digest_algo ? opt.def_digest_algo - : opt.s2k_digest_algo; + s2k->hash_algo = opt.s2k_digest_algo; cfx.dek = passphrase_to_dek( NULL, 0, opt.def_cipher_algo ? opt.def_cipher_algo : opt.s2k_cipher_algo , s2k, 2, NULL ); |