[git] GnuPG - branch, master, updated. gnupg-2.1.2-64-g1e4d8dd

[by Werner Koch]

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, master has been updated
       via  1e4d8ddbe3ad7ee8f1c1d1798694d91f792776c0 (commit)
      from  bdd22e3a0846d38a0b6cdb822476ad2f15d03455 (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 1e4d8ddbe3ad7ee8f1c1d1798694d91f792776c0
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Mar 25 10:12:11 2015 +0100

    sm: Change default algos to SHA256 (CSR) and AES128 (bulk encryption).
    
    * sm/certreqgen.c (create_request): Change default hash algo.
    * sm/gpgsm.c (DEFAULT_CIPHER_ALGO): Change default bulk cipher algo.
    --
    
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/sm/certreqgen.c b/sm/certreqgen.c
index 9720b80..0774591 100644
--- a/sm/certreqgen.c
+++ b/sm/certreqgen.c
@@ -807,7 +807,7 @@ create_request (ctrl_t ctrl,
   if (string)
     mdalgo = gcry_md_map_name (string);
   else
-    mdalgo = GCRY_MD_SHA1;
+    mdalgo = GCRY_MD_SHA256;
   rc = gcry_md_open (&md, mdalgo, 0);
   if (rc)
     {
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 62e29b8..773cf9c 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -438,7 +438,7 @@ static int default_include_certs = DEFAULT_INCLUDE_CERTS;
 static int default_validation_model;
 
 /* The default cipher algo.  */
-#define DEFAULT_CIPHER_ALGO "3DES"  /*des-EDE3-CBC*/
+#define DEFAULT_CIPHER_ALGO "AES"
 
 
 static char *build_list (const char *text,

-----------------------------------------------------------------------

Summary of changes:
 sm/certreqgen.c | 2 +-
 sm/gpgsm.c      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org