diff options
| author | Werner Koch <[email protected]> | 2022-03-28 13:24:48 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2022-03-28 13:25:55 +0000 |
| commit | 253fcb97775b268d0a9ac47c71076b3577fcba55 (patch) | |
| tree | a59e4aab1fe502cd098d7e79c1af52ea4ab98f6d | |
| parent | agent: KEYTOCARD prefers to specified time. (diff) | |
| download | gnupg-253fcb97775b268d0a9ac47c71076b3577fcba55.tar.gz gnupg-253fcb97775b268d0a9ac47c71076b3577fcba55.zip | |
gpg: Remove EAX from the preference list.
* g10/gpg.c (main): Remove note about rfc4880bis.
* g10/keygen.c (keygen_set_std_prefs): Use only OCB in the AEAD
preference list.
--
It is more than unlikely that EAX will ever be used in practice and
thus we remove it from the preference list.
| -rw-r--r-- | g10/gpg.c | 7 | ||||
| -rw-r--r-- | g10/keygen.c | 2 |
2 files changed, 1 insertions, 8 deletions
@@ -3846,12 +3846,7 @@ main (int argc, char **argv) if( may_coredump && !opt.quiet ) log_info(_("WARNING: program may create a core file!\n")); - if (opt.flags.rfc4880bis) - { - if (opt.verbose) - log_info ("Note: RFC4880bis features are enabled.\n"); - } - else + if (!opt.flags.rfc4880bis) { opt.mimemode = 0; /* This will use text mode instead. */ } diff --git a/g10/keygen.c b/g10/keygen.c index 8cd977c26..5660c8701 100644 --- a/g10/keygen.c +++ b/g10/keygen.c @@ -409,8 +409,6 @@ keygen_set_std_prefs (const char *string,int personal) if (opt.flags.rfc4880bis && !openpgp_aead_test_algo (AEAD_ALGO_OCB)) strcat(dummy_string,"A2 "); - if (opt.flags.rfc4880bis && !openpgp_aead_test_algo (AEAD_ALGO_EAX)) - strcat(dummy_string,"A1 "); if (personal) { |