From df0edaf91a220f8c6dffbfd1f795e229858b096b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Wed, 15 Apr 2020 22:21:46 +0200 Subject: gpg: Fix broken setting of AEAD algo. * g10/main.h (DEFAULT_AEAD_ALGO): Set to OCB. -- With the old code and using libgcrypt 1.9 would have switched from the high performance OCB to the ugly EAX mode. We are free software, we are OCB. --- g10/main.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/g10/main.h b/g10/main.h index 35b84618a..dedd60e73 100644 --- a/g10/main.h +++ b/g10/main.h @@ -41,13 +41,7 @@ # define DEFAULT_CIPHER_ALGO CIPHER_ALGO_3DES #endif -/* We will start using OCB mode by default only if the yet to be - * released libgcrypt 1.9 is used. */ -#if GCRYPT_VERSION_NUMBER < 0x010900 -# define DEFAULT_AEAD_ALGO AEAD_ALGO_OCB -#else -# define DEFAULT_AEAD_ALGO AEAD_ALGO_EAX -#endif +#define DEFAULT_AEAD_ALGO AEAD_ALGO_OCB #define DEFAULT_DIGEST_ALGO ((GNUPG)? DIGEST_ALGO_SHA256:DIGEST_ALGO_SHA1) #define DEFAULT_S2K_DIGEST_ALGO DIGEST_ALGO_SHA1 -- cgit v1.2.3