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

handling special Le's for encryption in iso SM driver

Browse Source
This commit is contained in:
Frank Morgner
2013-02-01 00:37:29 +01:00
parent e3947061c4
commit 9f6ffc2fad
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
npa/src/iso-sm.c
View File

@@ -319,7 +319,7 @@ static int sm_encrypt(const struct iso_sm_ctx *ctx, sc_card_t *card,
u8 *p, *le = NULL, *sm_data = NULL, *fdata = NULL, *mac_data = NULL, u8 *p, *le = NULL, *sm_data = NULL, *fdata = NULL, *mac_data = NULL,
*asn1 = NULL, *mac = NULL, *resp_data = NULL; *asn1 = NULL, *mac = NULL, *resp_data = NULL;
size_t sm_data_len, fdata_len, mac_data_len, asn1_len, mac_len, le_len; size_t sm_data_len, fdata_len, mac_data_len, asn1_len, mac_len, le_len;
int r; int r, cse;
sc_apdu_t *sm_apdu = NULL; sc_apdu_t *sm_apdu = NULL;
if (!apdu || !ctx || !card || !card->reader || !psm_apdu) { if (!apdu || !ctx || !card || !card->reader || !psm_apdu) {
@@ -354,7 +354,14 @@ static int sm_encrypt(const struct iso_sm_ctx *ctx, sc_card_t *card,
mac_data_len = r; mac_data_len = r;
/* get le and data depending on the case of the unsecure command */ /* get le and data depending on the case of the unsecure command */
switch (apdu->cse) { cse = apdu->cse;
if ((apdu->le/ctx->block_length + 1)*ctx->block_length + 18 > 0xff+1)
/* 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. */
cse |= SC_APDU_EXT;
switch (cse) {
case SC_APDU_CASE_1: case SC_APDU_CASE_1:
break; break;
case SC_APDU_CASE_2_SHORT: case SC_APDU_CASE_2_SHORT:
@@ -493,7 +500,7 @@ static int sm_encrypt(const struct iso_sm_ctx *ctx, sc_card_t *card,
sm_apdu->datalen = sm_data_len; sm_apdu->datalen = sm_data_len;
sm_apdu->lc = sm_data_len; sm_apdu->lc = sm_data_len;
sm_apdu->le = 0; sm_apdu->le = 0;
if (apdu->cse & SC_APDU_EXT) { if (cse & SC_APDU_EXT) {
sm_apdu->cse = SC_APDU_CASE_4_EXT; sm_apdu->cse = SC_APDU_CASE_4_EXT;
#if OPENSC_NOT_BOGUS_ANYMORE #if OPENSC_NOT_BOGUS_ANYMORE
sm_apdu->resplen = 0xffff+1; sm_apdu->resplen = 0xffff+1;

10
npa/src/npa.c
View File

@@ -329,15 +329,7 @@ int read_binary_rec(sc_card_t *card, unsigned char sfid,
} }
*ef_len = 0; *ef_len = 0;
if (read > SC_MAX_APDU_BUFFER_SIZE-2 if (read > 0xff+1)
|| (card->sm_ctx.sm_mode == SM_MODE_TRANSMIT
&& 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) / iso_sm_ctx->block_length)
* iso_sm_ctx->block_length - 1)))
sc_format_apdu(card, &apdu, SC_APDU_CASE_2_EXT, sc_format_apdu(card, &apdu, SC_APDU_CASE_2_EXT,
ISO_READ_BINARY, ISO_P1_FLAG_SFID|sfid, 0); ISO_READ_BINARY, ISO_P1_FLAG_SFID|sfid, 0);
else else