From d6f738729f0f4bf83c3a44fc4bba33ea6aaba622 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Wed, 8 Nov 2023 13:41:16 +0900 Subject: [PATCH] gpg,tools: Handle GPG_ERR_PIN_BLOCKED and GPG_ERR_NO_RESET_CODE. * g10/card-util.c (write_sc_op_status): Emit 3 and 4 in status line. * tools/card-call-scd.c (status_sc_op_failure): Likewise. -- Cherry-pick from master commit of: 64f5f7b74e428b15205f6e8ae14dec84663c3076 GnuPG-bug-id: 6425 Signed-off-by: NIIBE Yutaka --- g10/card-util.c | 6 ++++++ tools/card-call-scd.c | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/g10/card-util.c b/g10/card-util.c index b83472285..a66c2e3de 100644 --- a/g10/card-util.c +++ b/g10/card-util.c @@ -65,6 +65,12 @@ write_sc_op_status (gpg_error_t err) case GPG_ERR_BAD_RESET_CODE: write_status_text (STATUS_SC_OP_FAILURE, "2"); break; + case GPG_ERR_PIN_BLOCKED: + write_status_text (STATUS_SC_OP_FAILURE, "3"); + break; + case GPG_ERR_NO_RESET_CODE: + write_status_text (STATUS_SC_OP_FAILURE, "4"); + break; default: write_status (STATUS_SC_OP_FAILURE); break; diff --git a/tools/card-call-scd.c b/tools/card-call-scd.c index 98d3ddeb7..34b03e694 100644 --- a/tools/card-call-scd.c +++ b/tools/card-call-scd.c @@ -238,6 +238,12 @@ status_sc_op_failure (gpg_error_t err) case GPG_ERR_BAD_RESET_CODE: gnupg_status_printf (STATUS_SC_OP_FAILURE, "2"); break; + case GPG_ERR_PIN_BLOCKED: + gnupg_status_printf (STATUS_SC_OP_FAILURE, "3"); + break; + case GPG_ERR_NO_RESET_CODE: + gnupg_status_printf (STATUS_SC_OP_FAILURE, "4"); + break; default: gnupg_status_printf (STATUS_SC_OP_FAILURE, NULL); break;