[git] GnuPG - branch, wk/test-gpgrt-estream, updated. gnupg-2.1.0-beta783-15-g15cfd9a
by Werner Koch
cvs at cvs.gnupg.org
Tue Aug 26 23:24:00 CEST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".
The branch, wk/test-gpgrt-estream has been updated
via 15cfd9a3bcdd561091a28c8f989c616b87348463 (commit)
from 519305feb888b529c005b40445d041a088a2f8fc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 15cfd9a3bcdd561091a28c8f989c616b87348463
Author: Werner Koch <wk at gnupg.org>
Date: Tue Aug 26 23:20:07 2014 +0200
gpg: Remove CAST5 from the default prefs and order SHA-1 last.
* g10/keygen.c (keygen_set_std_prefs): Update prefs.
diff --git a/g10/keygen.c b/g10/keygen.c
index 1bf5348..c2c31d5 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 ");
-----------------------------------------------------------------------
Summary of changes:
g10/keygen.c | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
hooks/post-receive
--
The GNU Privacy Guard
http://git.gnupg.org
More information about the Gnupg-commits
mailing list