mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* main.h: Create S2K_DIGEST_ALGO macro so we do not need to always set
opt.s2k_digest_algo. This helps fix a problem with PGP 2.x encrypted symmetric messages. Change all callers (encode.c, g10.c, keyedit.c, keygen.c, passphrase.c, sign.c). * armor.c, cardglue.c, getkey.c, import.c, keygen.c: Be consistent in some more quoted strings. Always use 'user ID', not 'user id', "quotes" for user IDs, etc.
This commit is contained in:
parent
680be9be10
commit
4d26ab92cc
12 changed files with 45 additions and 34 deletions
|
@ -1133,7 +1133,7 @@ sign_symencrypt_file (const char *fname, STRLIST locusr)
|
|||
/* prepare key */
|
||||
s2k = m_alloc_clear( sizeof *s2k );
|
||||
s2k->mode = RFC1991? 0:opt.s2k_mode;
|
||||
s2k->hash_algo = opt.s2k_digest_algo;
|
||||
s2k->hash_algo = S2K_DIGEST_ALGO;
|
||||
|
||||
algo = default_cipher_algo();
|
||||
if (!opt.quiet || !opt.batch)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue