diff options
author | Werner Koch <[email protected]> | 2009-05-11 10:01:11 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2009-05-11 10:01:11 +0000 |
commit | 4694c1a8eb693b8bac58e5236003241fa54d5a8f (patch) | |
tree | 5c2f9c17afdff557a8c65da1d2be89c33438f42c | |
parent | Fix bug 1045. (diff) | |
download | gnupg-4694c1a8eb693b8bac58e5236003241fa54d5a8f.tar.gz gnupg-4694c1a8eb693b8bac58e5236003241fa54d5a8f.zip |
Fix bug 1045
-rw-r--r-- | g10/ChangeLog | 2 | ||||
-rw-r--r-- | g10/apdu.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 3e0acd6c2..2c07f1bc2 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,7 @@ 2009-05-11 Werner Koch <[email protected]> + * apdu.c (send_le): Replace log_error by log_info. Fixes bug#1043. + * skclist.c (build_sk_list): Use log_info for "duplicated entry". Fixes bug#1045. diff --git a/g10/apdu.c b/g10/apdu.c index cde6a48c2..d29676b41 100644 --- a/g10/apdu.c +++ b/g10/apdu.c @@ -2632,8 +2632,11 @@ send_le (int slot, int class, int ins, int p0, int p1, rc = send_apdu (slot, apdu, apdulen, result, &resultlen, pininfo); if (rc || resultlen < 2) { - log_error ("apdu_send_simple(%d) failed: %s\n", - slot, apdu_strerror (rc)); + /* We use log_info here so that in case of a transient error, and + if this module is used by gpg standalone, the error counter + isn't incremented. */ + log_info ("apdu_send_simple(%d) failed: %s\n", + slot, apdu_strerror (rc)); unlock_slot (slot); return rc? rc : SW_HOST_INCOMPLETE_CARD_RESPONSE; } |