mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* 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.
This commit is contained in:
parent
2bb29764af
commit
0cd879cd9c
4 changed files with 9 additions and 8 deletions
|
@ -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() ) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue