security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-20 14:37:08 +01:00
Code Activity

gpg,gpgsm: Extend the use of allow-ecc-encr and vsd-allow-ocb

Browse Source 
* g10/keygen.c (keygen_set_std_prefs): Set OCB only with VSD
compatibility flag.
* sm/certreqgen.c (proc_parameters): All ECC generation only with
allow-ecc-encr.
--
This commit is contained in:
Werner Koch 2023-03-24 13:50:37 +01:00
parent da04477631
commit fc351de879
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/keygen.c
View File

@ -523,6 +523,10 @@ keygen_set_std_prefs (const char *string,int personal)
xfree (prefstringbuf); xfree (prefstringbuf);
} }
/* For now we require a compat flag to set OCB into the preferences. */
if (!(opt.compat_flags & COMPAT_VSD_ALLOW_OCB))
ocb = 0;
if(!rc) if(!rc)
{ {
if(personal) if(personal)

3
sm/certreqgen.c
View File

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