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/encode.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 'g10/encode.c')
| -rw-r--r-- | g10/encode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/encode.c b/g10/encode.c index 1b83f244d..29b39975e 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -191,7 +191,7 @@ encode_simple( const char *filename, int mode, int use_seskey ) if( mode ) { 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; cfx.dek = passphrase_to_dek( NULL, 0, default_cipher_algo(), s2k, 2, NULL, NULL); @@ -380,7 +380,7 @@ setup_symkey(STRING2KEY **symkey_s2k,DEK **symkey_dek) { *symkey_s2k=m_alloc_clear(sizeof(STRING2KEY)); (*symkey_s2k)->mode = opt.s2k_mode; - (*symkey_s2k)->hash_algo = opt.s2k_digest_algo; + (*symkey_s2k)->hash_algo = S2K_DIGEST_ALGO; *symkey_dek=passphrase_to_dek(NULL,0,opt.s2k_cipher_algo, *symkey_s2k,2,NULL,NULL); |