mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-03 12:11:33 +01:00
gpg,gpgsm: Extend the use of allow-ecc-encr and vsd-allow-ocb
* 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:
parent
da04477631
commit
fc351de879
@ -523,6 +523,10 @@ keygen_set_std_prefs (const char *string,int personal)
|
||||
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(personal)
|
||||
|
@ -732,7 +732,8 @@ proc_parameters (ctrl_t ctrl, struct para_data_s *para,
|
||||
"(6:genkey(3:rsa(5:nbits%d:%s)))",
|
||||
(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 *flags;
|
||||
|
Loading…
x
Reference in New Issue
Block a user