aboutsummaryrefslogtreecommitdiffstats
path: root/tools/card-call-scd.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2020-06-30 12:36:44 +0000
committerWerner Koch <[email protected]>2020-06-30 12:41:49 +0000
commitfb10b6cba43f4ed8675093ac25f461de4dacdce9 (patch)
tree5ab56b9fed34be42287665eb0b36dc6f0b8e0f23 /tools/card-call-scd.c
parentecc: Support Ed448/X448 key generation. (diff)
downloadgnupg-fb10b6cba43f4ed8675093ac25f461de4dacdce9.tar.gz
gnupg-fb10b6cba43f4ed8675093ac25f461de4dacdce9.zip
card: Better detect removed cards. Add TCOS PIN menu.
* tools/card-call-scd.c (scd_change_pin): Add arg 'nullpin'. * tools/gpg-card.h (struct card_info_s): Add field 'card_removed'. * tools/gpg-card.c (fixup_scd_errors): New. (maybe_set_card_removed): New. (list_one_kinfo): Change type of first arg to get access to INFO. Set card_removed flag. (list_all_kinfo): Improve label alignment. (cmd_list): Check that the current card is still available. (cmd_passwd): Add option --nullpin and menu to chnage TCOS PINs. (dispatch_command): Handle card_removed flag. (interactive_loop): Ditto. -- Note that that I was not able to change the NullPIN of the standard PIN using a Signature V2 Brainpool test card. Changing the NullPIN of the QES PIN worked, though. I checked the commands send to scdaemon and they were correct - I used the very same command with gpg-connect-agent last week to set a Pin for a production Brainpool Signature card. Thus this might be a problem with this specific test card. Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'tools/card-call-scd.c')
-rw-r--r--tools/card-call-scd.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/tools/card-call-scd.c b/tools/card-call-scd.c
index 1116e072e..8e029a2bf 100644
--- a/tools/card-call-scd.c
+++ b/tools/card-call-scd.c
@@ -1586,17 +1586,10 @@ scd_applist (strlist_t *result, int all)
-/* Change the PIN of an OpenPGP card or reset the retry counter.
- * CHVNO 1: Change the PIN
- * 2: For v1 cards: Same as 1.
- * For v2 cards: Reset the PIN using the Reset Code.
- * 3: Change the admin PIN
- * 101: Set a new PIN and reset the retry counter
- * 102: For v1 cars: Same as 101.
- * For v2 cards: Set a new Reset Code.
- */
+/* Change the PIN of a card or reset the retry counter. If NULLPIN is
+ * set the TCOS specific NullPIN is changed. */
gpg_error_t
-scd_change_pin (const char *pinref, int reset_mode)
+scd_change_pin (const char *pinref, int reset_mode, int nullpin)
{
gpg_error_t err;
char line[ASSUAN_LINELENGTH];
@@ -1610,7 +1603,7 @@ scd_change_pin (const char *pinref, int reset_mode)
dfltparm.ctx = agent_ctx;
snprintf (line, sizeof line, "SCD PASSWD%s %s",
- reset_mode? " --reset":"", pinref);
+ nullpin? " --nullpin": reset_mode? " --reset":"", pinref);
err = assuan_transact (agent_ctx, line,
NULL, NULL,
default_inq_cb, &dfltparm,