security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

gpg: Curvenames may now compared case insensitive.

Browse Source 
* common/openpgp-oid.c (openpgp_curve_to_oid): Repalce strmcp by
ascii_strcasecmp.
(openpgp_oid_or_name_to_curve): Ditto.
(openpgp_is_curve_supported): Ditto.
(get_keyalgo_string): Ditto.
--

It was just to hard to remember the correct capitalization of
names like brainpoolP512r1.
This commit is contained in:
Werner Koch 2023-04-12 17:10:08 +02:00
parent 3013137f74
commit d965ee8d65
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/openpgp-oid.c
View File

@ -444,8 +444,9 @@ openpgp_curve_to_oid (const char *name, unsigned int *r_nbits, int *r_algo)
if (name) if (name)
{ {
for (i=0; oidtable[i].name; i++) for (i=0; oidtable[i].name; i++)
if (!strcmp (oidtable[i].name, name) if (!ascii_strcasecmp (oidtable[i].name, name)
|| (oidtable[i].alias && !strcmp (oidtable[i].alias, name))) || (oidtable[i].alias
&& !ascii_strcasecmp (oidtable[i].alias, name)))
{ {
oidstr = oidtable[i].oidstr; oidstr = oidtable[i].oidstr;
nbits = oidtable[i].nbits; nbits = oidtable[i].nbits;
@ -457,7 +458,7 @@ openpgp_curve_to_oid (const char *name, unsigned int *r_nbits, int *r_algo)
/* If not found assume the input is already an OID and check /* If not found assume the input is already an OID and check
whether we support it. */ whether we support it. */
for (i=0; oidtable[i].name; i++) for (i=0; oidtable[i].name; i++)
if (!strcmp (name, oidtable[i].oidstr)) if (!ascii_strcasecmp (name, oidtable[i].oidstr))
{ {
oidstr = oidtable[i].oidstr; oidstr = oidtable[i].oidstr;
nbits = oidtable[i].nbits; nbits = oidtable[i].nbits;
@ -506,9 +507,10 @@ openpgp_oid_or_name_to_curve (const char *oidname, int canon)
return NULL; return NULL;
for (i=0; oidtable[i].name; i++) for (i=0; oidtable[i].name; i++)
if (!strcmp (oidtable[i].oidstr, oidname) if (!ascii_strcasecmp (oidtable[i].oidstr, oidname)
|| !strcmp (oidtable[i].name, oidname) || !ascii_strcasecmp (oidtable[i].name, oidname)
|| (oidtable[i].alias &&!strcmp (oidtable[i].alias, oidname))) || (oidtable[i].alias
&& !ascii_strcasecmp (oidtable[i].alias, oidname)))
return !canon && oidtable[i].alias? oidtable[i].alias : oidtable[i].name; return !canon && oidtable[i].alias? oidtable[i].alias : oidtable[i].name;
return NULL; return NULL;
@ -570,8 +572,9 @@ openpgp_is_curve_supported (const char *name, int *r_algo,
*r_nbits = 0; *r_nbits = 0;
for (idx = 0; idx < DIM (oidtable) && oidtable[idx].name; idx++) for (idx = 0; idx < DIM (oidtable) && oidtable[idx].name; idx++)
{ {
if ((!strcmp (name, oidtable[idx].name) if ((!ascii_strcasecmp (name, oidtable[idx].name)
|| (oidtable[idx].alias && !strcmp (name, (oidtable[idx].alias)))) || (oidtable[idx].alias
&& !ascii_strcasecmp (name, (oidtable[idx].alias))))
&& curve_supported_p (oidtable[idx].name)) && curve_supported_p (oidtable[idx].name))
{ {
if (r_algo) if (r_algo)
@ -673,7 +676,7 @@ get_keyalgo_string (enum gcry_pk_algos algo,
{ {
if (keyalgo_strings[i].algo == algo if (keyalgo_strings[i].algo == algo
&& keyalgo_strings[i].curve && curve && keyalgo_strings[i].curve && curve
&& !strcmp (keyalgo_strings[i].curve, curve)) && !ascii_strcasecmp (keyalgo_strings[i].curve, curve))
return keyalgo_strings[i].name; return keyalgo_strings[i].name;
} }