diff options
| author | Werner Koch <wk@gnupg.org> | 2022-10-31 15:51:21 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2022-10-31 15:51:21 +0100 |
| commit | 5a2cef801d3506bedd700db1a5d88b7a75c4083b (patch) | |
| tree | 594b305eb753bbcb2bf1e5a6ea7d2cde190ebbd3 /g10/main.h | |
| parent | gpg: New option --compatibility-flags (diff) | |
| download | gnupg2-5a2cef801d3506bedd700db1a5d88b7a75c4083b.tar.xz gnupg2-5a2cef801d3506bedd700db1a5d88b7a75c4083b.zip | |
gpg: Allow only OCB for AEAD encryption.
* g10/gpg.c (opts): New option--force-ocb as alias for force-aead.
Turn --aead-algo and --personal-aead-preferences into dummy options.
(build_list_md_test_algo, build_list_aead_algo_name): Remove.
(my_strusage): Remove output of AEAD algos.
(main): Remove code from the --aead options.
* g10/encrypt.c (encrypt_seskey): Make file local.
(use_aead): Remove requirement for rfc4880bis. Always return
AEAD_ALGO_OCB.
* g10/main.h (DEFAULT_AEAD_ALGO): Removed unused macro.
* g10/misc.c (default_aead_algo): Remove.
* g10/pkclist.c (select_aead_from_pklist): Return AEAD_ALGO_OCB or 0.
(select_algo_from_prefs): Remove personal AEAD algo setting.
* g10/keygen.c (keygen_set_std_prefs): Remove AEAD preference option
parsing.
* g10/options.h (opt): Remove def_aead_algo and personal_aead_prefs.
--
Due to the meanwhile expired patent on OCB there is no more reason for
using EAX. Thus we forcefully use OCB if the AEAD feature flag is set
on a key.
Diffstat (limited to 'g10/main.h')
| -rw-r--r-- | g10/main.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/g10/main.h b/g10/main.h index 74c29cc92..408b029cb 100644 --- a/g10/main.h +++ b/g10/main.h @@ -41,8 +41,6 @@ # define DEFAULT_CIPHER_ALGO CIPHER_ALGO_3DES #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 #ifdef HAVE_ZIP @@ -169,7 +167,6 @@ const char *compress_algo_to_string(int algo); int string_to_compress_algo(const char *string); int check_compress_algo(int algo); int default_cipher_algo(void); -aead_algo_t default_aead_algo(void); int default_compress_algo(void); void compliance_failure(void); @@ -240,8 +237,6 @@ void display_online_help( const char *keyword ); /*-- encode.c --*/ gpg_error_t setup_symkey (STRING2KEY **symkey_s2k,DEK **symkey_dek); -gpg_error_t encrypt_seskey (DEK *dek, aead_algo_t aead_algo, DEK **r_seskey, - void **r_enckey, size_t *r_enckeylen); aead_algo_t use_aead (pk_list_t pk_list, int algo); int use_mdc (pk_list_t pk_list,int algo); int encrypt_symmetric (const char *filename ); |