From b4449ffabc10faa5f532be22738f2ef61828c33b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 5 Oct 2023 11:07:16 +0200 Subject: gpg-card: Give a hint on how to get help for the "yubikey" command. * tools/card-yubikey.c (yubikey_commands): Print a hint. --- tools/card-yubikey.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tools') diff --git a/tools/card-yubikey.c b/tools/card-yubikey.c index ece7edc48..63d49c762 100644 --- a/tools/card-yubikey.c +++ b/tools/card-yubikey.c @@ -332,6 +332,8 @@ yubikey_commands (card_info_t info, estream_t fp, int argc, const char *argv[]) cmd = ykDISABLE; else { + log_info ("Please use \"%s\" to list the available sub-commands\n", + "help yubikey"); err = gpg_error (GPG_ERR_UNKNOWN_COMMAND); goto leave; } -- cgit v1.2.3 From e783866f414097e38fb1cf0061005989d11c468b Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Tue, 3 Oct 2023 16:51:46 +0900 Subject: tools: Add TPM2DAEMON_SOCK_NAME for --remove-socketdir. * tools/gpgconf.c (main): Care about tpm2d. Emit correct ERR. -- Cherry-picked from master commit of: 25c84ffd1078e6619761aa731a82dbaf4175c02e Signed-off-by: NIIBE Yutaka --- tools/gpgconf.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/gpgconf.c b/tools/gpgconf.c index 6dcdc9f3c..f34248c40 100644 --- a/tools/gpgconf.c +++ b/tools/gpgconf.c @@ -963,7 +963,8 @@ main (int argc, char **argv) GPG_AGENT_SSH_SOCK_NAME, SCDAEMON_SOCK_NAME, KEYBOXD_SOCK_NAME, - DIRMNGR_SOCK_NAME + DIRMNGR_SOCK_NAME, + TPM2DAEMON_SOCK_NAME }; int i; char *p; @@ -976,8 +977,11 @@ main (int argc, char **argv) xfree (p); } if (gnupg_rmdir (socketdir)) - gc_error (1, 0, "error removing '%s': %s", - socketdir, gpg_strerror (err)); + { + err = gpg_error_from_syserror (); + gc_error (1, 0, "error removing '%s': %s", + socketdir, gpg_strerror (err)); + } } else if (gpg_err_code (err) == GPG_ERR_ENOENT) gc_error (0, 0, "warning: removing '%s' failed: %s", -- cgit v1.2.3 From 4963f13f8fa914acfc9addd5f4f19ff75d983ef5 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Fri, 6 Oct 2023 12:04:00 +0200 Subject: scd:openpgp: Return better error codes for the Reset Code. * scd/app-openpgp.c (do_change_pin): Use GPG_ERR_BAD_RESET_CODE where appropriate. * common/util.h: Add error codes missing in gpgrt 1.46. * agent/call-pinentry.c (unlock_pinentry): Handle GPG_ERR_BAD_RESET_CODE. (agent_askpin): Ditlo. Also simply condition. (agent_get_passphrase): Ditto. * g10/call-agent.c (status_sc_op_failure): Handle GPG_ERR_BAD_RESET_CODE. * g10/card-util.c (write_sc_op_status): Ditto. * tools/card-call-scd.c (status_sc_op_failure): Ditto. --- tools/card-call-scd.c | 1 + 1 file changed, 1 insertion(+) (limited to 'tools') diff --git a/tools/card-call-scd.c b/tools/card-call-scd.c index 27d8ad961..98d3ddeb7 100644 --- a/tools/card-call-scd.c +++ b/tools/card-call-scd.c @@ -235,6 +235,7 @@ status_sc_op_failure (gpg_error_t err) gnupg_status_printf (STATUS_SC_OP_FAILURE, "1"); break; case GPG_ERR_BAD_PIN: + case GPG_ERR_BAD_RESET_CODE: gnupg_status_printf (STATUS_SC_OP_FAILURE, "2"); break; default: -- cgit v1.2.3