mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
gpg,gpgsm: Remove compatibility_flags allow-ecc-encr and vsd-allow-encr.
* g10/options.h (COMPAT_VSD_ALLOW_OCB): Remove. * g10/gpg.c (compatibility_flags): Remove "vsd-allow_ocb". (main): Alwas set CO_EXTRA_INFO_VSD_ALLOW_OCB. * g10/keygen.c (keygen_set_std_prefs): Always set OCB feature flag. * g10/encrypt.c (use_aead): Always OCB also in de-vs mode. * sm/gpgsm.h (COMPAT_ALLOW_ECC_ENCR): Remove. * sm/gpgsm.c (compatibility_flags): Remove "allow-ecc-encr". * sm/encrypt.c (encrypt_dek): Always allow ecc encryption. * sm/certreqgen.c (proc_parameters): Likewise. -- Both feature are meanwhile approved in de-vs mode thus there is no more need for the flags.
This commit is contained in:
parent
6228bb0012
commit
97b37db144
8 changed files with 3 additions and 20 deletions
|
@ -1001,7 +1001,6 @@ static struct debug_flags_s debug_flags [] =
|
|||
/* The list of compatibility flags. */
|
||||
static struct compatibility_flags_s compatibility_flags [] =
|
||||
{
|
||||
{ COMPAT_VSD_ALLOW_OCB, "vsd-allow-ocb" },
|
||||
{ 0, NULL }
|
||||
};
|
||||
|
||||
|
@ -3825,8 +3824,7 @@ main (int argc, char **argv)
|
|||
parse_compatibility_flags (NULL, &opt.compat_flags, compatibility_flags);
|
||||
|
||||
gnupg_set_compliance_extra_info (CO_EXTRA_INFO_MIN_RSA, opt.min_rsa_length);
|
||||
if ((opt.compat_flags & COMPAT_VSD_ALLOW_OCB))
|
||||
gnupg_set_compliance_extra_info (CO_EXTRA_INFO_VSD_ALLOW_OCB, 1);
|
||||
gnupg_set_compliance_extra_info (CO_EXTRA_INFO_VSD_ALLOW_OCB, 1);
|
||||
|
||||
if (DBG_CLOCK)
|
||||
log_clock ("start");
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue