diff options
| author | Werner Koch <wk@gnupg.org> | 2014-12-15 17:38:40 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2014-12-15 17:38:40 +0100 |
| commit | dd65e21cb4934b40e6f2f7a8095f39fd6d9971bc (patch) | |
| tree | 789d4242e852d337de44a0195badb5e577a1ccae /scd/iso7816.c | |
| parent | gpg: Fix regression in notation data regression. (diff) | |
| download | gnupg2-dd65e21cb4934b40e6f2f7a8095f39fd6d9971bc.tar.xz gnupg2-dd65e21cb4934b40e6f2f7a8095f39fd6d9971bc.zip | |
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 <wk@gnupg.org>
Diffstat (limited to 'scd/iso7816.c')
| -rw-r--r-- | scd/iso7816.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scd/iso7816.c b/scd/iso7816.c index f1dbcffe4..3c43a4c81 100644 --- a/scd/iso7816.c +++ b/scd/iso7816.c @@ -64,7 +64,7 @@ map_sw (int sw) switch (sw) { case SW_EEPROM_FAILURE: ec = GPG_ERR_HARDWARE; break; - case SW_TERM_STATE: ec = GPG_ERR_CARD; break; + case SW_TERM_STATE: ec = GPG_ERR_OBJ_TERM_STATE; break; case SW_WRONG_LENGTH: ec = GPG_ERR_INV_VALUE; break; case SW_SM_NOT_SUP: ec = GPG_ERR_NOT_SUPPORTED; break; case SW_CC_NOT_SUP: ec = GPG_ERR_NOT_SUPPORTED; break; |