mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-03 12:11:33 +01:00
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.
This commit is contained in:
parent
f0a1c79f60
commit
253fcb9777
@ -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. */
|
||||
}
|
||||
|
@ -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)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user