From dd65e21cb4934b40e6f2f7a8095f39fd6d9971bc Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Mon, 15 Dec 2014 17:38:40 +0100 Subject: gpg: Add sub-command "factory-reset" to --card-edit. * common/util.h (GPG_ERR_OBJ_TERM_STATE): New. * scd/iso7816.c (map_sw): Add this error code. * scd/app-openpgp.c (do_getattr): Return the life cycle indicator. * scd/app.c (select_application): Allow a return value of GPG_ERR_OBJ_TERM_STATE. * scd/scdaemon.c (set_debug): Print the DBG_READER value. * g10/call-agent.c (start_agent): Print a status line for the termination state. (agent_scd_learn): Make arg "info" optional. (agent_scd_apdu): New. * g10/card-util.c (send_apdu): New. (factory_reset): New. (card_edit): Add command factory-reset. Signed-off-by: Werner Koch --- scd/scdaemon.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'scd/scdaemon.c') diff --git a/scd/scdaemon.c b/scd/scdaemon.c index 763ce2d90..7c786c2c4 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -344,7 +344,7 @@ set_debug (const char *level) gcry_control (GCRYCTL_SET_VERBOSITY, (int)opt.verbose); if (opt.debug) - log_info ("enabled debug flags:%s%s%s%s%s%s%s%s%s\n", + log_info ("enabled debug flags:%s%s%s%s%s%s%s%s%s%s\n", (opt.debug & DBG_COMMAND_VALUE)? " command":"", (opt.debug & DBG_MPI_VALUE )? " mpi":"", (opt.debug & DBG_CRYPTO_VALUE )? " crypto":"", @@ -353,7 +353,8 @@ set_debug (const char *level) (opt.debug & DBG_MEMSTAT_VALUE)? " memstat":"", (opt.debug & DBG_HASHING_VALUE)? " hashing":"", (opt.debug & DBG_ASSUAN_VALUE )? " assuan":"", - (opt.debug & DBG_CARD_IO_VALUE)? " cardio":""); + (opt.debug & DBG_CARD_IO_VALUE)? " cardio":"", + (opt.debug & DBG_READER_VALUE )? " reader":""); } -- cgit v1.2.3