aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2015-03-25 09:12:11 +0000
committerWerner Koch <[email protected]>2015-03-25 09:12:11 +0000
commit1e4d8ddbe3ad7ee8f1c1d1798694d91f792776c0 (patch)
tree905025099b2295123493dfcaab9eddeaf236659d
parentgpg,w32: Handle forward slash in --keyring option. (diff)
downloadgnupg-1e4d8ddbe3ad7ee8f1c1d1798694d91f792776c0.tar.gz
gnupg-1e4d8ddbe3ad7ee8f1c1d1798694d91f792776c0.zip
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 <[email protected]>
-rw-r--r--sm/certreqgen.c2
-rw-r--r--sm/gpgsm.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sm/certreqgen.c b/sm/certreqgen.c
index 9720b80e2..0774591ba 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 62e29b86f..773cf9cab 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,