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

fixed case 2 extended apdu parsing

Browse Source 
git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@269 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-09-19 12:00:26 +00:00
parent eee134d9c0
commit c0762d0466
1 changed files with 107 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

105
ccid/src/scutil.c
View File

@@ -96,95 +96,98 @@ int build_apdu(sc_context_t *ctx, const u8 *buf, size_t len, sc_apdu_t *apdu)
apdu->p1 = *p++; apdu->p1 = *p++;
apdu->p2 = *p++; apdu->p2 = *p++;
len -= 4; len -= 4;
if (len > 1) { if (!len) {
/* case 2 with le=0 and case 4 with lc=0 are the only short APDUs, apdu->cse = SC_APDU_CASE_1;
* where the next byte is 0. Their length (without header) is 1 and } else {
* 2 respectively */ if (*p == 0 && len >= 3) {
if (*p == 0 && len > 2) { /* ...must be an extended APDU */
/* ...must be an extended length APDU */
p++; p++;
if (len == 3) { if (len == 3) {
apdu->le = (*p++)<<8; apdu->le = (*p++)<<8;
apdu->le += *p++; apdu->le += *p++;
if (apdu->le == 0) if (apdu->le == 0)
apdu->le = 0xffff; apdu->le = 0xffff+1;
len -= 3; len -= 3;
apdu->cse = SC_APDU_CASE_2_SHORT; apdu->cse = SC_APDU_CASE_2_EXT;
} else { } else {
/* len > 3 */
apdu->lc = (*p++)<<8; apdu->lc = (*p++)<<8;
apdu->lc += *p++; apdu->lc += *p++;
len -= 3; len -= 3;
if (len < apdu->lc) { if (len < apdu->lc) {
sc_error(ctx, "APDU too short (need %lu bytes)\n", sc_error(ctx, "APDU too short (need %lu more bytes)\n",
(unsigned long) apdu->lc - len); (unsigned long) apdu->lc - len);
return SC_ERROR_INVALID_DATA; return SC_ERROR_INVALID_DATA;
} }
apdu->data = p;
apdu->datalen = apdu->lc;
len -= apdu->lc; len -= apdu->lc;
p += apdu->lc; p += apdu->lc;
if (len) { if (!len) {
if (*p++ != 0) { apdu->cse = SC_APDU_CASE_3_EXT;
sc_error(ctx, "Extended APDU needs Lc, that begins with 0x00)\n", } else {
if (len < 3) {
sc_error(ctx, "APDU too short (need %lu more bytes)\n",
(unsigned long) apdu->lc - len); (unsigned long) apdu->lc - len);
return SC_ERROR_INVALID_DATA; return SC_ERROR_INVALID_DATA;
} }
if (*p++ != 0) {
sc_error(ctx, "Extended APDU needs Le, that begins with 0x00)\n");
return SC_ERROR_INVALID_DATA;
}
apdu->le = (*p++)<<8; apdu->le = (*p++)<<8;
apdu->le += *p++; apdu->le += *p++;
if (apdu->le == 0) if (apdu->le == 0)
apdu->le = 0xffff; apdu->le = 0xffff+1;
len -= 3; len -= 3;
apdu->cse = SC_APDU_CASE_4_EXT; apdu->cse = SC_APDU_CASE_4_EXT;
} else {
apdu->cse = SC_APDU_CASE_3_EXT;
}
if (len) {
sc_error(ctx, "APDU too long (%lu bytes extra)\n",
(unsigned long) len);
return SC_ERROR_INVALID_DATA;
} }
} }
} else { } else {
apdu->lc = *p++; /* ...must be a short APDU */
len--; if (len == 1) {
apdu->data = p;
apdu->datalen = apdu->lc;
if (len < apdu->lc) {
sc_error(ctx, "APDU too short (need %lu bytes)\n",
(unsigned long) apdu->lc - len);
return SC_ERROR_INVALID_DATA;
}
len -= apdu->lc;
p += apdu->lc;
if (len) {
apdu->le = *p++; apdu->le = *p++;
if (apdu->le == 0) if (apdu->le == 0)
apdu->le = 0xff; apdu->le = 0xff+1;
len--;
apdu->cse = SC_APDU_CASE_4_SHORT;
} else {
apdu->cse = SC_APDU_CASE_3_SHORT;
}
if (len) {
sc_error(ctx, "APDU too long (%lu bytes extra)\n",
(unsigned long) len);
return SC_ERROR_INVALID_DATA;
}
}
} else if (len == 1) {
apdu->le = *p++;
if (apdu->le == 0)
apdu->le = 256;
len--; len--;
apdu->cse = SC_APDU_CASE_2_SHORT; apdu->cse = SC_APDU_CASE_2_SHORT;
} else { } else {
apdu->cse = SC_APDU_CASE_1; apdu->lc = *p++;
len--;
if (len < apdu->lc) {
sc_error(ctx, "APDU too short (need %lu more bytes)\n",
(unsigned long) apdu->lc - len);
return SC_ERROR_INVALID_DATA;
}
apdu->data = p;
apdu->datalen = apdu->lc;
len -= apdu->lc;
p += apdu->lc;
if (!len) {
apdu->cse = SC_APDU_CASE_3_SHORT;
} else {
apdu->le = *p++;
if (apdu->le == 0)
apdu->le = 0xff+1;
len--;
apdu->cse = SC_APDU_CASE_4_SHORT;
}
}
}
if (len) {
sc_error(ctx, "APDU too long (%lu bytes extra)\n",
(unsigned long) len);
return SC_ERROR_INVALID_DATA;
}
} }
apdu->flags = SC_APDU_FLAGS_NO_GET_RESP|SC_APDU_FLAGS_NO_RETRY_WL; apdu->flags = SC_APDU_FLAGS_NO_GET_RESP|SC_APDU_FLAGS_NO_RETRY_WL;
sc_debug(ctx, "Case %d %s APDU, %u bytes:\tins=%02x p1=%02x p2=%02x", sc_debug(ctx, "Case %d %s APDU, %lu bytes:\tins=%02x p1=%02x p2=%02x",
apdu->cse & SC_APDU_SHORT_MASK, apdu->cse & SC_APDU_SHORT_MASK,
(apdu->cse & SC_APDU_EXT) != 0 ? "extended" : "short", (apdu->cse & SC_APDU_EXT) != 0 ? "extended" : "short",
(unsigned int) len0, apdu->ins, apdu->p1, apdu->p2); (unsigned long) len0, apdu->ins, apdu->p1, apdu->p2);
return SC_SUCCESS; return SC_SUCCESS;
} }