security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

* main.h: Create S2K_DIGEST_ALGO macro so we do not need to always set

Browse source 
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:
David Shaw 2004-09-24 20:34:38 +00:00
parent 680be9be10
commit 4d26ab92cc
12 changed files with 45 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
g10/passphrase.c
View file

@ -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