diff options
| author | Werner Koch <wk@gnupg.org> | 2014-08-26 23:20:07 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-08-26 23:20:07 +0200 |
| commit | 15cfd9a3bcdd561091a28c8f989c616b87348463 (patch) | |
| tree | fdcb1ac122cec9d0211278aa28f44e223b4b91ec /g10 | |
| parent | Switch to the libgpg-error provided estream. (diff) | |
| download | gnupg2-15cfd9a3bcdd561091a28c8f989c616b87348463.tar.xz gnupg2-15cfd9a3bcdd561091a28c8f989c616b87348463.zip | |
gpg: Remove CAST5 from the default prefs and order SHA-1 last.
* g10/keygen.c (keygen_set_std_prefs): Update prefs.
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/keygen.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/g10/keygen.c b/g10/keygen.c index 1bf534837..c2c31d52e 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -338,23 +338,14 @@ keygen_set_std_prefs (const char *string,int personal) strcat(dummy_string,"S8 "); if ( !openpgp_cipher_test_algo (CIPHER_ALGO_AES) ) strcat(dummy_string,"S7 "); - if ( !openpgp_cipher_test_algo (CIPHER_ALGO_CAST5) ) - strcat(dummy_string,"S3 "); strcat(dummy_string,"S2 "); /* 3DES */ /* The default hash algo order is: - SHA-256, SHA-1, SHA-384, SHA-512, SHA-224. - Ordering SHA-1 before SHA-384 might be viewed as a bit - strange; it is done because we expect that soon enough - SHA-3 will be available and at that point there should - be no more need for SHA-384 etc. Anyway this order is - just a default and can easily be changed by a config - option. */ + SHA-256, SHA-384, SHA-512, SHA-224, SHA-1. + */ if (!openpgp_md_test_algo (DIGEST_ALGO_SHA256)) strcat (dummy_string, "H8 "); - strcat (dummy_string, "H2 "); /* SHA-1 */ - if (!openpgp_md_test_algo (DIGEST_ALGO_SHA384)) strcat (dummy_string, "H9 "); @@ -364,6 +355,8 @@ keygen_set_std_prefs (const char *string,int personal) if (!openpgp_md_test_algo (DIGEST_ALGO_SHA224)) strcat (dummy_string, "H11 "); + strcat (dummy_string, "H2 "); /* SHA-1 */ + if(!check_compress_algo(COMPRESS_ALGO_ZLIB)) { strcat(dummy_string,"Z2 "); |