diff options
| author | Werner Koch <[email protected]> | 2020-02-11 13:51:50 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2020-02-11 13:51:50 +0000 |
| commit | 323548acd9defde0a8ea7d74c18cd4a1b339ff2e (patch) | |
| tree | ac6b02f6febebbbeedb648c69eaefbb998e14a3e | |
| parent | scd:openpgp: Allow auto-changing of the key attributes in genkey. (diff) | |
| download | gnupg-323548acd9defde0a8ea7d74c18cd4a1b339ff2e.tar.gz gnupg-323548acd9defde0a8ea7d74c18cd4a1b339ff2e.zip | |
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 <[email protected]>
| -rw-r--r-- | scd/app-openpgp.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index fabf2d01a..c5e7c5df8 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -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 { |