security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-06-25 21:37:58 +02:00
Code Activity

gpg: Do not show the secp256k1 curve in --full-gen-key.

Browse Source 
* g10/keygen.c (ask_curve): Add a curve aparemter to no list a curbe in
the menu.
--

This is non-standard curve and thus has severe interop problems.  To
avoid accidental selection of this curve, it may now only be given by
its name.
This commit is contained in:
Werner Koch 2025-06-24 08:49:28 +02:00
parent e6592f2f46
commit 49a9171f63
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -4,6 +4,9 @@ Noteworthy changes in version 2.5.9 (unreleased)
* gpg: Add the revocation reason to the sigclass of a "rev" line. * gpg: Add the revocation reason to the sigclass of a "rev" line.
Regression in 2.5.7. [T7073] Regression in 2.5.7. [T7073]
* gpg: Do not show the non-standard secp256k1 curve in the menu to
select the curve. It can however be specified using its name.
Release-info: https://dev.gnupg.org/T7695 Release-info: https://dev.gnupg.org/T7695

23
g10/keygen.c
View File

@ -3152,6 +3152,7 @@ ask_curve (int *algo, int *subkey_algo, const char *current)
unsigned int supported : 1; /* Supported by gpg. */ unsigned int supported : 1; /* Supported by gpg. */
unsigned int de_vs : 1; /* Allowed in CO_DE_VS. */ unsigned int de_vs : 1; /* Allowed in CO_DE_VS. */
unsigned int expert_only : 1; /* Only with --expert */ unsigned int expert_only : 1; /* Only with --expert */
unsigned int no_listing : 1; /* Do not show in the menu */
unsigned int available : 1; /* Available in Libycrypt (runtime checked) */ unsigned int available : 1; /* Available in Libycrypt (runtime checked) */
} curves[] = { } curves[] = {
#if GPG_USE_ECDSA || GPG_USE_ECDH #if GPG_USE_ECDSA || GPG_USE_ECDH
@ -3159,15 +3160,15 @@ ask_curve (int *algo, int *subkey_algo, const char *current)
#else #else
# define MY_USE_ECDSADH 0 # define MY_USE_ECDSADH 0
#endif #endif
{ "Curve25519", "Ed25519", "Curve 25519", !!GPG_USE_EDDSA, 0, 0, 0 }, { "Curve25519", "Ed25519", "Curve 25519", !!GPG_USE_EDDSA, 0,0,0,0 },
{ "X448", "Ed448", "Curve 448", !!GPG_USE_EDDSA, 0, 1, 0 }, { "X448", "Ed448", "Curve 448", !!GPG_USE_EDDSA, 0,1,0,0 },
{ "NIST P-256", NULL, NULL, MY_USE_ECDSADH, 0, 1, 0 }, { "NIST P-256", NULL, NULL, MY_USE_ECDSADH, 0,1,0,0 },
{ "NIST P-384", NULL, NULL, MY_USE_ECDSADH, 0, 0, 0 }, { "NIST P-384", NULL, NULL, MY_USE_ECDSADH, 0,0,0,0 },
{ "NIST P-521", NULL, NULL, MY_USE_ECDSADH, 0, 1, 0 }, { "NIST P-521", NULL, NULL, MY_USE_ECDSADH, 0,1,0,0 },
{ "brainpoolP256r1", NULL, "Brainpool P-256", MY_USE_ECDSADH, 1, 0, 0 }, { "brainpoolP256r1", NULL, "Brainpool P-256", MY_USE_ECDSADH, 1,0,0,0 },
{ "brainpoolP384r1", NULL, "Brainpool P-384", MY_USE_ECDSADH, 1, 1, 0 }, { "brainpoolP384r1", NULL, "Brainpool P-384", MY_USE_ECDSADH, 1,1,0,0 },
{ "brainpoolP512r1", NULL, "Brainpool P-512", MY_USE_ECDSADH, 1, 1, 0 }, { "brainpoolP512r1", NULL, "Brainpool P-512", MY_USE_ECDSADH, 1,1,0,0 },
{ "secp256k1", NULL, NULL, MY_USE_ECDSADH, 0, 1, 0 }, { "secp256k1", NULL, NULL, MY_USE_ECDSADH, 0,1,1,0 },
}; };
#undef MY_USE_ECDSADH #undef MY_USE_ECDSADH
int idx; int idx;
@ -3220,6 +3221,7 @@ ask_curve (int *algo, int *subkey_algo, const char *current)
} }
curves[idx].available = 1; curves[idx].available = 1;
if (!curves[idx].no_listing)
tty_printf (" (%d) %s%s\n", idx + 1, tty_printf (" (%d) %s%s\n", idx + 1,
curves[idx].pretty_name? curves[idx].pretty_name?
curves[idx].pretty_name:curves[idx].name, curves[idx].pretty_name:curves[idx].name,
@ -3238,7 +3240,8 @@ ask_curve (int *algo, int *subkey_algo, const char *current)
xfree(answer); xfree(answer);
return NULL; return NULL;
} }
else if (*answer && !idx) else if (*answer && (!idx || (idx > 0 && idx <= DIM (curves)
&& curves[idx-1].no_listing)))
{ {
/* See whether the user entered the name of the curve. */ /* See whether the user entered the name of the curve. */
for (idx=0; idx < DIM(curves); idx++) for (idx=0; idx < DIM(curves); idx++)