VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fixed recursive write of EFs

Browse Source
This commit is contained in:
Frank Morgner
2013-02-04 23:31:02 +01:00
parent a6a10d0b3e
commit 4fd23d08fb
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
npa/src/npa.c
View File

@@ -309,6 +309,7 @@ int get_pace_capabilities(u8 *bitmap)
return SC_SUCCESS; return SC_SUCCESS;
} }
#define ISO_READ_BINARY 0xB0 #define ISO_READ_BINARY 0xB0
#define ISO_P1_FLAG_SFID 0x80 #define ISO_P1_FLAG_SFID 0x80
int read_binary_rec(sc_card_t *card, unsigned char sfid, int read_binary_rec(sc_card_t *card, unsigned char sfid,
@@ -384,7 +385,7 @@ int write_binary_rec(sc_card_t *card, unsigned char sfid,
int r; int r;
/* we write less bytes than possible. this is a workaround for acr 122, /* we write less bytes than possible. this is a workaround for acr 122,
* which only supports apdus of max 250 bytes */ * which only supports apdus of max 250 bytes */
size_t write = maxresp - 8; size_t write = maxresp - 8, wrote = 0;
sc_apdu_t apdu; sc_apdu_t apdu;
struct iso_sm_ctx *iso_sm_ctx = card->sm_ctx.info.cmd_data; struct iso_sm_ctx *iso_sm_ctx = card->sm_ctx.info.cmd_data;
@@ -402,10 +403,10 @@ int write_binary_rec(sc_card_t *card, unsigned char sfid,
* padded to the block size. */ * padded to the block size. */
-18) / iso_sm_ctx->block_length) -18) / iso_sm_ctx->block_length)
* iso_sm_ctx->block_length - 1))) * iso_sm_ctx->block_length - 1)))
sc_format_apdu(card, &apdu, SC_APDU_CASE_2_EXT, sc_format_apdu(card, &apdu, SC_APDU_CASE_3_EXT,
ISO_WRITE_BINARY, ISO_P1_FLAG_SFID|sfid, 0); ISO_WRITE_BINARY, ISO_P1_FLAG_SFID|sfid, 0);
else else
sc_format_apdu(card, &apdu, SC_APDU_CASE_2_SHORT, sc_format_apdu(card, &apdu, SC_APDU_CASE_3_SHORT,
ISO_WRITE_BINARY, ISO_P1_FLAG_SFID|sfid, 0); ISO_WRITE_BINARY, ISO_P1_FLAG_SFID|sfid, 0);
if (write > ef_len) { if (write > ef_len) {
@@ -415,26 +416,29 @@ int write_binary_rec(sc_card_t *card, unsigned char sfid,
apdu.datalen = write; apdu.datalen = write;
apdu.lc = write; apdu.lc = write;
} }
apdu.data = ef;
r = sc_transmit_apdu(card, &apdu); r = sc_transmit_apdu(card, &apdu);
/* emulate the behaviour of sc_write_binary */ /* emulate the behaviour of sc_write_binary */
if (r >= 0) if (r >= 0)
r = apdu.resplen; r = apdu.datalen;
while (1) { while (1) {
if (r < 0 || r > ef_len) { if (r < 0 || r > ef_len) {
sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not write EF."); sc_debug(card->ctx, SC_LOG_DEBUG_VERBOSE, "Could not write EF.");
goto err; goto err;
} }
ef_len -= r; wrote += r;
ef += r; apdu.data += r;
if (!ef_len) if (wrote >= ef_len)
break; break;
r = sc_write_binary(card, ef_len, ef, write, 0); r = sc_write_binary(card, wrote, ef, write, 0);
} }
r = SC_SUCCESS;
err: err:
return r; return r;
} }