diff options
| author | David Shaw <[email protected]> | 2004-09-24 20:34:38 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-09-24 20:34:38 +0000 |
| commit | 4d26ab92cc852f73e97ff4f977f2efd1f6808e14 (patch) | |
| tree | 09ee9cbb6119e60870929c668963f3d2164f4845 /g10/passphrase.c | |
| parent | * keyedit.c (keyedit_menu), gpgv.c (agent_scd_getattr (stub)), keygen.c (diff) | |
| download | gnupg-4d26ab92cc852f73e97ff4f977f2efd1f6808e14.tar.gz gnupg-4d26ab92cc852f73e97ff4f977f2efd1f6808e14.zip | |
* 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.
Diffstat (limited to '')
| -rw-r--r-- | g10/passphrase.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c index e4546ee5a..7a3a394b5 100644 --- a/g10/passphrase.c +++ b/g10/passphrase.c @@ -1083,7 +1083,7 @@ passphrase_to_dek( u32 *keyid, int pubkey_algo, * Note: This must match the code in encode.c with opt.rfc1991 set */ s2k = &help_s2k; s2k->mode = 0; - s2k->hash_algo = opt.s2k_digest_algo; + s2k->hash_algo = S2K_DIGEST_ALGO; } /* If we do not have a passphrase available in NEXT_PW and status |