aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2016-05-02 06:56:02 +0000
committerNIIBE Yutaka <[email protected]>2016-11-29 08:08:57 +0000
commit51464a0eadc82c84780fba08a53163cb6e4da2a4 (patch)
tree11e860bb2380c5240da1aa890be042c5172aef29
parentscd: Improve error handling. (diff)
downloadgnupg-51464a0eadc82c84780fba08a53163cb6e4da2a4.tar.gz
gnupg-51464a0eadc82c84780fba08a53163cb6e4da2a4.zip
scd: More fix of error return path.
* scd/command.c (open_card): Return GPG_ERR_ENODEV on the failure of apdu_connect. -- Backport of master commit: 6677d8b61446eb5760a30a2488c992d6e895a9ed GnuPG-bug-id: 2306 Signed-off-by: NIIBE Yutaka <[email protected]>
-rw-r--r--scd/command.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/scd/command.c b/scd/command.c
index b26bd6862..44f0b21bd 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -482,8 +482,8 @@ open_card (ctrl_t ctrl, const char *apptype)
else if (sw == SW_HOST_CARD_INACTIVE)
err = gpg_error (GPG_ERR_CARD_RESET);
else
- err = gpg_error (GPG_ERR_CARD);
- }
+ err = gpg_error (GPG_ERR_ENODEV);
+ }
else
err = select_application (ctrl, slot, apptype, &ctrl->app_ctx);
}