security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-22 14:57:02 +01:00
Code Activity

scd:openpgp: Allow the reading the key by keygrip.

Browse Source 
* scd/app-openpgp.c (do_readkey): Allow the keygrip for the keyid.
Use case insensitive match forthe keyid.
(do_readcert): Allow the keygrip for the keyid.
--

This patch is only to sync ths up with master.
This commit is contained in:
Werner Koch 2023-10-11 10:04:52 +02:00
parent 9252847646
commit 4e47639af0
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
scd/app-openpgp.c
View File

@ -2213,11 +2213,25 @@ do_readkey (app_t app, ctrl_t ctrl, const char *keyid, unsigned int flags,
(void)ctrl; (void)ctrl;
if (!strcmp (keyid, "OPENPGP.1")) if (strlen (keyid) == 40)
{
const unsigned char *keygrip_str;
for (keyno = 0; keyno < 3; keyno++)
{
keygrip_str = app->app_local->pk[keyno].keygrip_str;
if (!strncmp (keygrip_str, keyid, 40))
break;
}
if (keyno >= 3)
return gpg_error (GPG_ERR_INV_ID);
}
else if (!ascii_strcasecmp (keyid, "OPENPGP.1"))
keyno = 0; keyno = 0;
else if (!strcmp (keyid, "OPENPGP.2")) else if (!ascii_strcasecmp (keyid, "OPENPGP.2"))
keyno = 1; keyno = 1;
else if (!strcmp (keyid, "OPENPGP.3")) else if (!ascii_strcasecmp (keyid, "OPENPGP.3"))
keyno = 2; keyno = 2;
else else
return gpg_error (GPG_ERR_INV_ID); return gpg_error (GPG_ERR_INV_ID);
@ -2280,7 +2294,28 @@ do_readcert (app_t app, const char *certid,
*cert = NULL; *cert = NULL;
*certlen = 0; *certlen = 0;
if (!ascii_strcasecmp (certid, "OPENPGP.3")) if (strlen (certid) == 40)
{
int keyno;
const unsigned char *keygrip_str;
for (keyno = 0; keyno < 3; keyno++)
{
keygrip_str = app->app_local->pk[keyno].keygrip_str;
if (!strncmp (keygrip_str, certid, 40))
break;
}
if (keyno == 2)
;
else if (keyno == 1)
occurrence = 1;
else if (keyno == 0)
occurrence = 2;
else
return gpg_error (GPG_ERR_INV_ID);
}
else if (!ascii_strcasecmp (certid, "OPENPGP.3"))
; ;
else if (!ascii_strcasecmp (certid, "OPENPGP.2")) else if (!ascii_strcasecmp (certid, "OPENPGP.2"))
occurrence = 1; occurrence = 1;