From 946555ea3ceb823b95ed13654ae4fd667daa4337 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 8 Dec 2020 17:45:18 +0900 Subject: [PATCH] scd:yubikey: Fix support of Yubikey NEO. * scd/app-openpgp.c (get_public_key): Yubikey NEO also has this issue. Signed-off-by: NIIBE Yutaka --- scd/app-openpgp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c index 7a2aebe70..8f6512fa5 100644 --- a/scd/app-openpgp.c +++ b/scd/app-openpgp.c @@ -1920,6 +1920,9 @@ get_public_key (app_t app, int keyno) /* Yubikey returns wrong code. Fix it up. */ if (app->card->cardtype == CARDTYPE_YUBIKEY) err = gpg_error (GPG_ERR_NO_OBJ); + /* Yubikey NEO (!CARDTYPE_YUBIKEY) also returns wrong code. Fix it up. */ + else if (gpg_err_code (err) == GPG_ERR_CARD) + err = gpg_error (GPG_ERR_NO_OBJ); log_error (_("reading public key failed: %s\n"), gpg_strerror (err)); goto leave; }