security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

scd: Fix cmd_apdu on error.

Browse Source 
* scd/command.c (cmd_apdu): Fix the code path on error.

--

GnuPG-bug-id: 6476
Reported-by: Robin Krahl
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2023-05-01 11:36:36 +09:00
parent 625bd92410
commit 3cf5fc2e2f
No known key found for this signature in database
GPG Key ID: 640114AF89DE6054
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scd/apdu.c
View File

@ -3260,7 +3260,7 @@ apdu_send_simple (int slot, int extended_mode,
* Out of historical reasons the function returns 0 on success and * Out of historical reasons the function returns 0 on success and
* outs the status word at the end of the result to be able to get the * outs the status word at the end of the result to be able to get the
* status word in the case of a not provided RETBUF, R_SW can be used * status word in the case of a not provided RETBUF, R_SW can be used
* to store the SW. But note that R_SW qill only be set if the * to store the SW. But note that R_SW will only be set if the
* function returns 0. */ * function returns 0. */
int int
apdu_send_direct (int slot, size_t extended_length, apdu_send_direct (int slot, size_t extended_length,

5
scd/command.c
View File

@ -2200,7 +2200,10 @@ cmd_apdu (assuan_context_t ctx, char *line)
apdu, apdulen, handle_more, apdu, apdulen, handle_more,
NULL, &result, &resultlen); NULL, &result, &resultlen);
if (rc) if (rc)
log_error ("apdu_send_direct failed: %s\n", gpg_strerror (rc)); {
log_error ("apdu_send_direct failed: %s\n", apdu_strerror (rc));
rc = iso7816_map_sw (rc);
}
else else
{ {
rc = assuan_send_data (ctx, result, resultlen); rc = assuan_send_data (ctx, result, resultlen);