security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

gpg,gpgsm: Remove compatibility_flags allow-ecc-encr and vsd-allow-encr.

Browse source 
* 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:
Werner Koch 2024-05-06 14:34:48 +02:00
parent 6228bb0012
commit 97b37db144
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
8 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sm/certreqgen.c
View file

@ -732,8 +732,7 @@ proc_parameters (ctrl_t ctrl, struct para_data_s *para,
"(6:genkey(3:rsa(5:nbits%d:%s)))",
(int)strlen (numbuf), numbuf);
}
else if ((opt.compat_flags & COMPAT_ALLOW_ECC_ENCR)
&& (algo == GCRY_PK_ECC || algo == GCRY_PK_EDDSA))
else if (algo == GCRY_PK_ECC || algo == GCRY_PK_EDDSA)
{
const char *curve = get_parameter_value (para, pKEYCURVE, 0);
const char *flags;

5
sm/encrypt.c
View file

@ -483,10 +483,7 @@ encrypt_dek (const DEK dek, ksba_cert_t cert, int pk_algo,
s_data = NULL; /* (avoid compiler warning) */
if (pk_algo == GCRY_PK_ECC)
{
if (!(opt.compat_flags & COMPAT_ALLOW_ECC_ENCR))
rc = gpg_error (GPG_ERR_NOT_SUPPORTED);
else
rc = ecdh_encrypt (dek, s_pkey, &s_ciph);
rc = ecdh_encrypt (dek, s_pkey, &s_ciph);
}
else
{

1
sm/gpgsm.c
View file

@ -469,7 +469,6 @@ static struct debug_flags_s debug_flags [] =
static struct compatibility_flags_s compatibility_flags [] =
{
{ COMPAT_ALLOW_KA_TO_ENCR, "allow-ka-to-encr" },
{ COMPAT_ALLOW_ECC_ENCR, "allow-ecc-encr" },
{ 0, NULL }
};

1
sm/gpgsm.h
View file

@ -183,7 +183,6 @@ struct
* policies: 1.3.6.1.4.1.7924.1.1:N:
*/
#define COMPAT_ALLOW_KA_TO_ENCR 1
#define COMPAT_ALLOW_ECC_ENCR 2
/* Forward declaration for an object defined in server.c */