security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Werner Koch 2023-04-04 09:20:26 +02:00
parent 56d309133f
commit 7bf57a794b
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS
View File

@ -7,12 +7,18 @@ Noteworthy changes in version 2.4.1 (unreleased)
"[self-signature]" instead of the user-id in key signature "[self-signature]" instead of the user-id in key signature
listings. [rG103acfe9ca] listings. [rG103acfe9ca]
* gpg: For symmetric encryption the default S2K hash is now SHA256.
[T6367]
* gpgsm: Verification of detached signatures does now strip trailing * gpgsm: Verification of detached signatures does now strip trailing
zeroes from the input if --assume-binary is used. [rG2a13f7f9dc] zeroes from the input if --assume-binary is used. [rG2a13f7f9dc]
* gpgsm: Non-armored detached signature are now created without * gpgsm: Non-armored detached signature are now created without
using indefinite form length octets. This improves compatibility using indefinite form length octets. This improves compatibility
with some PDF signature verification software. with some PDF signature verification software. [rG8996b0b655]
* dirmngr: The LDAP modifyTimestamp is now returned by some
keyserver commands. [rG56d309133f]
* gpg: Make list-options "show-sig-subpackets" work again. * gpg: Make list-options "show-sig-subpackets" work again.
Fixes regression in 2.4.0. [rG5a223303d7] Fixes regression in 2.4.0. [rG5a223303d7]

4
g10/main.h
View File

@ -42,7 +42,7 @@
#endif #endif
#define DEFAULT_DIGEST_ALGO ((GNUPG)? DIGEST_ALGO_SHA256:DIGEST_ALGO_SHA1) #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 #ifdef HAVE_ZIP
# define DEFAULT_COMPRESS_ALGO COMPRESS_ALGO_ZIP # define DEFAULT_COMPRESS_ALGO COMPRESS_ALGO_ZIP
#else #else
@ -235,7 +235,7 @@ int cpr_get_answer_okay_cancel (const char *keyword,
/*-- helptext.c --*/ /*-- helptext.c --*/
void display_online_help( const char *keyword ); void display_online_help( const char *keyword );
/*-- encode.c --*/ /*-- encrypt.c --*/
gpg_error_t setup_symkey (STRING2KEY **symkey_s2k,DEK **symkey_dek); gpg_error_t setup_symkey (STRING2KEY **symkey_s2k,DEK **symkey_dek);
aead_algo_t use_aead (pk_list_t pk_list, int algo); aead_algo_t use_aead (pk_list_t pk_list, int algo);
int use_mdc (pk_list_t pk_list,int algo); int use_mdc (pk_list_t pk_list,int algo);