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

added calculation of longest encrypted short-length APDU

Browse Source
This commit is contained in:
Frank Morgner
2012-10-08 20:40:45 +02:00
parent df00bca2f0
commit a08ce27552
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
npa/src/npa.c
View File

@@ -329,7 +329,13 @@ static int get_ef(struct sm_ctx *npactx, sc_card_t *card, unsigned char sfid,
}
*ef_len = 0;
if (read > SC_MAX_APDU_BUFFER_SIZE - 2)
if (read > SC_MAX_APDU_BUFFER_SIZE-2
|| (npactx && read > (((SC_MAX_APDU_BUFFER_SIZE-2
/* for encrypted APDUs we usually get authenticated status
* bytes (4B), a MAC (11B) and a cryptogram with padding
* indicator (3B without data). The cryptogram is always
* padded to the block size. */
-18) / npactx->block_length) * npactx->block_length - 1)))
sc_format_apdu(card, &apdu, SC_APDU_CASE_2_EXT,
ISO_READ_BINARY, ISO_P1_FLAG_SFID|sfid, 0);
else