mirror of
git://git.gnupg.org/gnupg.git
synced 2025-03-28 22:49:59 +01:00
* keygen.c (keygen_set_std_prefs): Add SHA256 and BZip2 to default
preferences.
This commit is contained in:
parent
c71639cfff
commit
08bd93f7dc
@ -1,5 +1,8 @@
|
|||||||
2005-05-05 David Shaw <dshaw@jabberwocky.com>
|
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
|
* options.h, g10.c (main): Add new --default-sig-expire and
|
||||||
--default-cert-expire options. Suggested by Florian Weimer.
|
--default-cert-expire options. Suggested by Florian Weimer.
|
||||||
|
|
||||||
|
22
g10/keygen.c
22
g10/keygen.c
@ -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
|
/* 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))
|
if(!check_cipher_algo(CIPHER_ALGO_AES256))
|
||||||
strcat(dummy_string,"S9 ");
|
strcat(dummy_string,"S9 ");
|
||||||
if(!check_cipher_algo(CIPHER_ALGO_AES192))
|
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))
|
if(!check_cipher_algo(CIPHER_ALGO_IDEA))
|
||||||
strcat(dummy_string,"S1 ");
|
strcat(dummy_string,"S1 ");
|
||||||
|
|
||||||
/* SHA-1, RIPEMD160, ZLIB, ZIP */
|
/* SHA-1 */
|
||||||
strcat(dummy_string,"H2 H3 Z2 Z1");
|
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;
|
string=dummy_string;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user