summaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2023-04-04 09:20:26 +0200
committerWerner Koch <wk@gnupg.org>2023-04-04 09:20:26 +0200
commit7bf57a794b77c5002c337b892bf90f59d5c82fe7 (patch)
tree521d4ae4a8e7c227b07b28627ff2b97aff39cef9 /g10
parentdirmngr: Return modifyTimestamp and add server option --newer. (diff)
downloadgnupg2-7bf57a794b77c5002c337b892bf90f59d5c82fe7.tar.xz
gnupg2-7bf57a794b77c5002c337b892bf90f59d5c82fe7.zip
gpg: Set the default digest algo for S2K to SHA256.
* g10/main.h (DEFAULT_S2K_DIGEST_ALGO): Alias to DEFAULT_DIGEST_ALGO. -- GnuPG-bug-id: 6367
Diffstat (limited to 'g10')
-rw-r--r--g10/main.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/g10/main.h b/g10/main.h
index dbaa0c6f3..3d71d0c09 100644
--- a/g10/main.h
+++ b/g10/main.h
@@ -42,7 +42,7 @@
#endif
#define DEFAULT_DIGEST_ALGO ((GNUPG)? DIGEST_ALGO_SHA256:DIGEST_ALGO_SHA1)
-#define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1
+#define DEFAULT_S2K_DIGEST_ALGO DEFAULT_DIGEST_ALGO
#ifdef HAVE_ZIP
# define DEFAULT_COMPRESS_ALGO COMPRESS_ALGO_ZIP
#else
@@ -235,7 +235,7 @@ int cpr_get_answer_okay_cancel (const char *keyword,
/*-- helptext.c --*/
void display_online_help( const char *keyword );
-/*-- encode.c --*/
+/*-- encrypt.c --*/
gpg_error_t setup_symkey (STRING2KEY **symkey_s2k,DEK **symkey_dek);
aead_algo_t use_aead (pk_list_t pk_list, int algo);
int use_mdc (pk_list_t pk_list,int algo);