giomba/opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libopensc: few debug messages more

Browse Source
This commit is contained in:
Viktor Tarasov 2016-04-28 10:51:49 +02:00
parent 6d4a4dfae0
commit 91a28c613c
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/libopensc/apdu.c
View File

@ -256,9 +256,11 @@ int
sc_check_apdu(sc_card_t *card, const sc_apdu_t *apdu) sc_check_apdu(sc_card_t *card, const sc_apdu_t *apdu)
{ {
if ((apdu->cse & ~SC_APDU_SHORT_MASK) == 0) { if ((apdu->cse & ~SC_APDU_SHORT_MASK) == 0) {
/* length check for short APDU */ /* length check for short APDU */
if (apdu->le > 256 || (apdu->lc > 255 && (apdu->flags & SC_APDU_FLAGS_CHAINING) == 0)) if (apdu->le > 256 || (apdu->lc > 255 && (apdu->flags & SC_APDU_FLAGS_CHAINING) == 0)) {
sc_log(card->ctx, "failed length check for short APDU");
goto error; goto error;
}
} }
else if ((apdu->cse & SC_APDU_EXT) != 0) { else if ((apdu->cse & SC_APDU_EXT) != 0) {
/* check if the card supports extended APDUs */ /* check if the card supports extended APDUs */
@ -267,8 +269,10 @@ sc_check_apdu(sc_card_t *card, const sc_apdu_t *apdu)
goto error; goto error;
} }
/* length check for extended APDU */ /* length check for extended APDU */
if (apdu->le > 65536 || apdu->lc > 65535) if (apdu->le > 65536 || apdu->lc > 65535) {
sc_log(card->ctx, "failed length check for extended APDU");
goto error; goto error;
}
} }
else { else {
goto error; goto error;
@ -281,7 +285,7 @@ sc_check_apdu(sc_card_t *card, const sc_apdu_t *apdu)
goto error; goto error;
break; break;
case SC_APDU_CASE_2_SHORT: case SC_APDU_CASE_2_SHORT:
/* no data is sent */ /* no data is sent */
if (apdu->datalen != 0 || apdu->lc != 0) if (apdu->datalen != 0 || apdu->lc != 0)
goto error; goto error;
/* data is expected */ /* data is expected */
@ -293,7 +297,7 @@ sc_check_apdu(sc_card_t *card, const sc_apdu_t *apdu)
goto error; goto error;
break; break;
case SC_APDU_CASE_3_SHORT: case SC_APDU_CASE_3_SHORT:
/* data is sent */ /* data is sent */
if (apdu->datalen == 0 || apdu->data == NULL || apdu->lc == 0) if (apdu->datalen == 0 || apdu->data == NULL || apdu->lc == 0)
goto error; goto error;
/* no data is expected */ /* no data is expected */
@ -304,7 +308,7 @@ sc_check_apdu(sc_card_t *card, const sc_apdu_t *apdu)
goto error; goto error;
break; break;
case SC_APDU_CASE_4_SHORT: case SC_APDU_CASE_4_SHORT:
/* data is sent */ /* data is sent */
if (apdu->datalen == 0 || apdu->data == NULL || apdu->lc == 0) if (apdu->datalen == 0 || apdu->data == NULL || apdu->lc == 0)
goto error; goto error;
/* data is expected */ /* data is expected */