aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2022-05-06 09:15:31 +0000
committerNIIBE Yutaka <[email protected]>2022-05-10 05:21:09 +0000
commita5217c90003c2e1b9bfb06b58ffc2d0d9164f22a (patch)
treef782d547ca98ab9e5df3cf680497a1457b303a3e
parentscd:p15: Improve the displayed S/N for Technology Nexus cards. (diff)
downloadgnupg-a5217c90003c2e1b9bfb06b58ffc2d0d9164f22a.tar.gz
gnupg-a5217c90003c2e1b9bfb06b58ffc2d0d9164f22a.zip
scd: Add workaround for ECC attribute on Yubikey.
* scd/app-openpgp.c (parse_algorithm_attribute): Skip possibly bogus octet in a key attribute. -- Apply master commit of: 054d14887ef8fa1cbadef4ed2ea28213f25f5d25 GnuPG-bug-id: 5963 Signed-off-by: NIIBE Yutaka <[email protected]>
-rw-r--r--scd/app-openpgp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
index 2b8e780ab..c65d6b198 100644
--- a/scd/app-openpgp.c
+++ b/scd/app-openpgp.c
@@ -5246,7 +5246,8 @@ parse_algorithm_attribute (app_t app, int keyno)
app->app_local->keyattr[keyno].ecc.flags = 0;
- if (buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
+ if (APP_CARD(app)->cardtype == CARDTYPE_YUBIKEY
+ || buffer[buflen-1] == 0x00 || buffer[buflen-1] == 0xff)
{ /* Found "pubkey required"-byte for private key template. */
oidlen--;
if (buffer[buflen-1] == 0xff)