1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-06-25 01:42:45 +02:00

* keygen.c (keygen_set_std_prefs): Add SHA256 and BZip2 to default

preferences.
This commit is contained in:
David Shaw 2005-05-05 21:18:47 +00:00
parent c71639cfff
commit 08bd93f7dc
2 changed files with 22 additions and 3 deletions

View File

@ -1,5 +1,8 @@
2005-05-05 David Shaw <dshaw@jabberwocky.com>
* keygen.c (keygen_set_std_prefs): Add SHA256 and BZip2 to default
preferences.
* options.h, g10.c (main): Add new --default-sig-expire and
--default-cert-expire options. Suggested by Florian Weimer.

View File

@ -348,7 +348,8 @@ keygen_set_std_prefs (const char *string,int personal)
*/
/* Make sure we do not add more than 15 items here, as we
could overflow the size of dummy_string. */
could overflow the size of dummy_string. We currently
have at most 12. */
if(!check_cipher_algo(CIPHER_ALGO_AES256))
strcat(dummy_string,"S9 ");
if(!check_cipher_algo(CIPHER_ALGO_AES192))
@ -368,8 +369,23 @@ keygen_set_std_prefs (const char *string,int personal)
if(!check_cipher_algo(CIPHER_ALGO_IDEA))
strcat(dummy_string,"S1 ");
/* SHA-1, RIPEMD160, ZLIB, ZIP */
strcat(dummy_string,"H2 H3 Z2 Z1");
/* SHA-1 */
strcat(dummy_string,"H2 ");
if(!check_digest_algo(DIGEST_ALGO_SHA256))
strcat(dummy_string,"H8 ");
/* RIPEMD160 */
strcat(dummy_string,"H3 ");
/* ZLIB */
strcat(dummy_string,"Z2 ");
if(!check_compress_algo(COMPRESS_ALGO_BZIP2))
strcat(dummy_string,"Z3 ");
/* ZIP */
strcat(dummy_string,"Z1");
string=dummy_string;
}