diff options
| author | David Shaw <[email protected]> | 2005-05-05 22:08:37 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-05-05 22:08:37 +0000 |
| commit | da0c60a98761d0b9311bbb42750e6ee534ed3f7b (patch) | |
| tree | 216950eb93aa5ab295eae723b6d96d2df9d59019 /g10/encode.c | |
| parent | * keygen.c (keygen_set_std_prefs): Add SHA256 and BZip2 to default (diff) | |
| download | gnupg-da0c60a98761d0b9311bbb42750e6ee534ed3f7b.tar.gz gnupg-da0c60a98761d0b9311bbb42750e6ee534ed3f7b.zip | |
* keygen.c (start_tree): New function to "prime" a KBNODE list.
(do_generate_keypair): Use it here rather than creating and deleting a
comment packet.
* keygen.c (gen_elg, gen_dsa): Do not put public factors in secret key as
a comment.
* options.h, encode.c (encode_simple, encode_crypt), keygen.c (do_create):
Remove disabled comment packet code.
Diffstat (limited to 'g10/encode.c')
| -rw-r--r-- | g10/encode.c | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/g10/encode.c b/g10/encode.c index d1898b371..90735c1b1 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -1,6 +1,6 @@ /* encode.c - encode data - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, - * 2004 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, + * 2005 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -248,14 +248,7 @@ encode_simple( const char *filename, int mode, int use_seskey ) if( opt.armor ) iobuf_push_filter( out, armor_filter, &afx ); -#ifdef ENABLE_COMMENT_PACKETS - else { - write_comment( out, "#created by GNUPG v" VERSION " (" - PRINTABLE_OS_NAME ")"); - if( opt.comment_string ) - write_comment( out, opt.comment_string ); - } -#endif + if( s2k && !RFC1991 ) { PKT_symkey_enc *enc = m_alloc_clear( sizeof *enc + seskeylen + 1 ); enc->version = 4; @@ -504,14 +497,7 @@ encode_crypt( const char *filename, STRLIST remusr, int use_symkey ) if( opt.armor ) iobuf_push_filter( out, armor_filter, &afx ); -#ifdef ENABLE_COMMENT_PACKETS - else { - write_comment( out, "#created by GNUPG v" VERSION " (" - PRINTABLE_OS_NAME ")"); - if( opt.comment_string ) - write_comment( out, opt.comment_string ); - } -#endif + /* create a session key */ cfx.dek = m_alloc_secure_clear (sizeof *cfx.dek); if( !opt.def_cipher_algo ) { /* try to get it from the prefs */ |