scd:openpgp: Optional allow for lowercase keyrefs.

* scd/app-openpgp.c (do_readkey): Use case insensitive match of the
keyref.
(do_writekey, do_sign, do_auth, do_decipher): Ditto.
--

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2020-02-11 14:51:50 +01:00
parent d7d75da505
commit 323548acd9
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 10 additions and 10 deletions

View File

@ -1953,11 +1953,11 @@ do_readkey (app_t app, ctrl_t ctrl, const char *keyid, unsigned int flags,
if (keyno >= 3)
return gpg_error (GPG_ERR_INV_ID);
}
else if (!strcmp (keyid, "OPENPGP.1"))
else if (!ascii_strcasecmp (keyid, "OPENPGP.1"))
keyno = 0;
else if (!strcmp (keyid, "OPENPGP.2"))
else if (!ascii_strcasecmp (keyid, "OPENPGP.2"))
keyno = 1;
else if (!strcmp (keyid, "OPENPGP.3"))
else if (!ascii_strcasecmp (keyid, "OPENPGP.3"))
keyno = 2;
else
return gpg_error (GPG_ERR_INV_ID);
@ -4350,11 +4350,11 @@ do_writekey (app_t app, ctrl_t ctrl,
(void)ctrl;
if (!strcmp (keyid, "OPENPGP.1"))
if (!ascii_strcasecmp (keyid, "OPENPGP.1"))
keyno = 0;
else if (!strcmp (keyid, "OPENPGP.2"))
else if (!ascii_strcasecmp (keyid, "OPENPGP.2"))
keyno = 1;
else if (!strcmp (keyid, "OPENPGP.3"))
else if (!ascii_strcasecmp (keyid, "OPENPGP.3"))
keyno = 2;
else
return gpg_error (GPG_ERR_INV_ID);
@ -4775,9 +4775,9 @@ do_sign (app_t app, ctrl_t ctrl, const char *keyidstr, int hashalgo,
#undef X
/* Check whether an OpenPGP card of any version has been requested. */
if (!strcmp (keyidstr, "OPENPGP.1"))
if (!ascii_strcasecmp (keyidstr, "OPENPGP.1"))
;
else if (!strcmp (keyidstr, "OPENPGP.3"))
else if (!ascii_strcasecmp (keyidstr, "OPENPGP.3"))
use_auth = 1;
else
{
@ -4932,7 +4932,7 @@ do_auth (app_t app, ctrl_t ctrl, const char *keyidstr,
}
/* Check whether an OpenPGP card of any version has been requested. */
if (!strcmp (keyidstr, "OPENPGP.3"))
if (!ascii_strcasecmp (keyidstr, "OPENPGP.3"))
;
else
{
@ -4987,7 +4987,7 @@ do_decipher (app_t app, ctrl_t ctrl, const char *keyidstr,
return gpg_error (GPG_ERR_INV_VALUE);
/* Check whether an OpenPGP card of any version has been requested. */
if (!strcmp (keyidstr, "OPENPGP.2"))
if (!ascii_strcasecmp (keyidstr, "OPENPGP.2"))
;
else
{