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/keygen.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/keygen.c')
| -rw-r--r-- | g10/keygen.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index d75f0b826..d1c6e609b 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -1506,8 +1506,8 @@ ask_user_id( int mode ) if( !mode ) tty_printf( _("\n" -"You need a User-ID to identify your key; the software constructs the user id\n" -"from Real Name, Comment and Email Address in this form:\n" +"You need a user ID to identify your key; the software constructs the user ID\n" +"from the Real Name, Comment and Email Address in this form:\n" " \"Heinrich Heine (Der Dichter) <[email protected]>\"\n\n") ); uid = aname = acomment = amail = NULL; for(;;) { @@ -1676,7 +1676,7 @@ do_ask_passphrase( STRING2KEY **ret_s2k ) s2k = m_alloc_secure( sizeof *s2k ); for(;;) { s2k->mode = opt.s2k_mode; - s2k->hash_algo = opt.s2k_digest_algo; + s2k->hash_algo = S2K_DIGEST_ALGO; dek = passphrase_to_dek( NULL, 0, opt.s2k_cipher_algo, s2k,2, errtext, NULL); if( !dek ) { @@ -2012,7 +2012,7 @@ proc_parameter_file( struct para_data_s *para, const char *fname, s2k = m_alloc_secure( sizeof *s2k ); s2k->mode = opt.s2k_mode; - s2k->hash_algo = opt.s2k_digest_algo; + s2k->hash_algo = S2K_DIGEST_ALGO; set_next_passphrase( r->u.value ); dek = passphrase_to_dek( NULL, 0, opt.s2k_cipher_algo, s2k, 2, NULL, NULL); @@ -2912,7 +2912,7 @@ generate_subkeypair( KBNODE pub_keyblock, KBNODE sec_keyblock ) if( passphrase ) { s2k = m_alloc_secure( sizeof *s2k ); s2k->mode = opt.s2k_mode; - s2k->hash_algo = opt.s2k_digest_algo; + s2k->hash_algo = S2K_DIGEST_ALGO; set_next_passphrase( passphrase ); dek = passphrase_to_dek( NULL, 0, opt.s2k_cipher_algo, s2k, 2, NULL, NULL ); |