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

- finished simulation of ta/ca

Browse Source 
- fixed parsing case 4 extended apdu


git-svn-id: https://vsmartcard.svn.sourceforge.net/svnroot/vsmartcard@278 96b47cad-a561-4643-ad3b-153ac7d7599c
This commit is contained in:
frankmorgner
2010-09-24 14:07:47 +00:00
parent 32ce7352ef
commit d195ea474a
2 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ccid/src/cats-tool.c
View File

@@ -379,9 +379,31 @@ main(int argc, char *argv[])
0x00, 0x2A, 0x00, 0xBE, 0x00, 0x01, 0x41, 0x7F, 0x4E, 0x81, 0xFA, 0x5F, 0x29, 0x01, 0x00, 0x42, 0x0E, 0x5A, 0x5A, 0x44, 0x56, 0x43, 0x41, 0x41, 0x54, 0x41, 0x30, 0x30, 0x30, 0x30, 0x35, 0x7F, 0x49, 0x4F, 0x06, 0x0A, 0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x02, 0x02, 0x03, 0x86, 0x41, 0x04, 0x9B, 0xFE, 0x74, 0x15, 0xD7, 0x3C, 0x4A, 0x78, 0xD6, 0x0B, 0x2C, 0xC1, 0xBC, 0xA1, 0x1B, 0x6D, 0x5E, 0x52, 0x39, 0x69, 0xAC, 0xFB, 0x5B, 0x75, 0x6A, 0x3B, 0xE1, 0x55, 0x1B, 0x22, 0x23, 0x9C, 0x79, 0xAE, 0x36, 0x2B, 0x83, 0x8B, 0x00, 0x66, 0x99, 0x83, 0xC0, 0xCA, 0xF6, 0xED, 0x0C, 0x78, 0x1D, 0x40, 0x1C, 0x95, 0xD2, 0xB3, 0x28, 0x57, 0xDE, 0x8C, 0xE1, 0xB6, 0x19, 0xDA, 0xC4, 0xA7, 0x5F, 0x20, 0x0A, 0x5A, 0x5A, 0x53, 0x49, 0x54, 0x30, 0x30, 0x30, 0x4F, 0x34, 0x7F, 0x4C, 0x12, 0x06, 0x09, 0x04, 0x00, 0x7F, 0x00, 0x07, 0x03, 0x01, 0x02, 0x02, 0x53, 0x05, 0x00, 0x00, 0x00, 0x00, 0x04, 0x5F, 0x25, 0x06, 0x01, 0x00, 0x00, 0x09, 0x02, 0x01, 0x5F, 0x24, 0x06, 0x01, 0x00, 0x00, 0x09, 0x02, 0x06, 0x65, 0x5E, 0x73, 0x2D, 0x06, 0x09, 0x04, 0x00, 0x7F, 0x00, 0x07, 0x03, 0x01, 0x03, 0x02, 0x80, 0x20, 0xB0, 0x2B, 0xAA, 0x51, 0xA9, 0x4F, 0xAC, 0x09, 0x54, 0xDF, 0x20, 0x4D, 0x61, 0xFE, 0x22, 0xDA, 0x1D, 0x40, 0x8D, 0x45, 0xDB, 0x4A, 0xA1, 0xD7, 0x0E, 0x60, 0x0D, 0xAD, 0x4F, 0xAF, 0x67, 0x99, 0x73, 0x2D, 0x06, 0x09, 0x04, 0x00, 0x7F, 0x00, 0x07, 0x03, 0x01, 0x03, 0x01, 0x80, 0x20, 0xC7, 0x2E, 0x13, 0x58, 0x2F, 0x01, 0xBA, 0x06, 0x8D, 0xD1, 0xAA, 0xC2, 0x9A, 0x24, 0x28, 0xC0, 0xC5, 0x4A, 0xB9, 0xC2, 0x04, 0xFD, 0x53, 0xB3, 0xF1, 0x3E, 0x82, 0x90, 0xE2, 0x1E, 0x50, 0xF9, 0x5F, 0x37, 0x40, 0x83, 0xC5, 0xB4, 0x41, 0xFE, 0xC5, 0xB1, 0x8E, 0xFD, 0x1C, 0xAA, 0x4A, 0x11, 0xB8, 0xE1, 0xCE, 0xDE, 0x0A, 0x8B, 0x42, 0xD4, 0x42, 0xF0, 0x0D, 0x7F, 0x60, 0x4E, 0x42, 0x9F, 0x33, 0x9B, 0x4E, 0x3E, 0x6C, 0x06, 0xF9, 0xE7, 0x6A, 0x2D, 0xAA, 0x82, 0xC1, 0x72, 0x2E, 0xE1, 0x37, 0xA8, 0x90, 0x38, 0xB9, 0x69, 0xC6, 0x34, 0x56, 0x15, 0x81, 0xE6, 0xC2, 0x6D, 0x9F, 0x6F, 0xA7, 0x5C, 0x52,
0x00, 0x22, 0x81, 0xA4, 0x53, 0x80, 0x0A, 0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x02, 0x02, 0x03, 0x83, 0x0A, 0x5A, 0x5A, 0x53, 0x49, 0x54, 0x30, 0x30, 0x30, 0x4F, 0x34, 0x91, 0x20, 0x88, 0xE5, 0xF2, 0xC6, 0x11, 0x18, 0x0D, 0x0A, 0xC1, 0x0E, 0xBD, 0xE6, 0xFC, 0x2A, 0x5E, 0x62, 0x41, 0x79, 0xC0, 0xA5, 0x77, 0xC3, 0xE4, 0x88, 0x52, 0xDD, 0x81, 0xA4, 0xCD, 0xF7, 0x90, 0x51, 0x67, 0x17, 0x73, 0x15, 0x06, 0x09, 0x04, 0x00, 0x7F, 0x00, 0x07, 0x03, 0x01, 0x04, 0x02, 0x53, 0x08, 0x32, 0x30, 0x31, 0x30, 0x30, 0x39, 0x32, 0x34,
0x00, 0x84, 0x00, 0x00, 0x08,
0x00, 0x82, 0x00, 0x00, 0x40, 0x0C, 0x9E, 0x7D, 0xB7, 0x2C, 0xB0, 0xFA, 0xEA, 0x15, 0xB0, 0x0F, 0xEC, 0xAE, 0x02, 0x57, 0x54, 0x64, 0x46, 0xA9, 0x39, 0x58, 0x62, 0x23, 0x9A, 0xF2, 0x40, 0xC3, 0xC2, 0x9E, 0x85, 0x7F, 0x84, 0x03, 0x34, 0x58, 0x17, 0x76, 0x0F, 0xE1, 0x3F, 0x65, 0x97, 0xF0, 0x4D, 0x2F, 0x73, 0x30, 0xB5, 0x90, 0x65, 0xF6, 0x8D, 0xF7, 0x1E, 0xF7, 0xFD, 0xEC, 0x86, 0x74, 0x3C, 0xDE, 0x28, 0x69, 0xDD,
0x00, 0xA4, 0x00, 0x0C, 0x02, 0x3F, 0x00,
0x00, 0xA4, 0x02, 0x0C, 0x02, 0x01, 0x1D,
0x00, 0xB0, 0x00, 0x00, 0x80,
0x00, 0xB0, 0x00, 0x80, 0x80,
0x00, 0xB0, 0x01, 0x00, 0x80,
0x00, 0xB0, 0x01, 0x80, 0x80,
0x00, 0xB0, 0x02, 0x00, 0x80,
0x00, 0xB0, 0x02, 0x80, 0x80,
0x00, 0xB0, 0x03, 0x00, 0x80,
0x00, 0xB0, 0x03, 0x80, 0x80,
0x00, 0xB0, 0x04, 0x00, 0x80,
0x00, 0xB0, 0x04, 0x80, 0x80,
0x00, 0xB0, 0x05, 0x00, 0x80,
0x00, 0xB0, 0x05, 0x80, 0x80,
0x00, 0xB0, 0x06, 0x00, 0x80,
0x00, 0xB0, 0x06, 0x80, 0x80,
0x00, 0xB0, 0x07, 0x00, 0x80,
0x00, 0xB0, 0x07, 0x80, 0x80,
0x00, 0x22, 0x41, 0xA4, 0x0C, 0x80, 0x0A, 0x04, 0x00, 0x7F, 0x00, 0x07, 0x02, 0x02, 0x03, 0x02, 0x02,
0x00, 0x86, 0x00, 0x00, 0x45, 0x7C, 0x43, 0x80, 0x41, 0x04, 0x23, 0x9E, 0x3D, 0x05, 0xEE, 0xB0, 0x59, 0x11, 0x7D, 0x30, 0xF8, 0x6A, 0xEB, 0x5A, 0xE7, 0xD1, 0x2E, 0x0E, 0xBF, 0x75, 0x88, 0x89, 0xC7, 0x91, 0x15, 0xF2, 0xA1, 0x3D, 0xC1, 0xBB, 0x57, 0x0A, 0x5C, 0xAD, 0x91, 0xA3, 0x84, 0x33, 0x7C, 0x09, 0xD1, 0xB7, 0x4B, 0xED, 0x1C, 0x0F, 0xF1, 0x95, 0xA7, 0xC3, 0xEA, 0x3A, 0x2C, 0xED, 0xF8, 0x6D, 0xDE, 0xF7, 0xB9, 0x5D, 0x1F, 0xD1, 0xB3, 0x5D, 0x00,
};
LPBYTE ridbuf = ridbufs;
DWORD ridlens[] = {20, 233, 21, 328, 88, 5};
DWORD ridlens[] = {20, 233, 21, 328, 88, 5, 69, 7, 7, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5, 5, 5, 5, 5, 5, 5, 17, 75};
SCARD_IO_REQUEST ridpioRecvPci;
for (l = 0; l < sizeof(ridlens)/sizeof(DWORD); l++) {
recvlen = sizeof(recvbuf);

12
ccid/src/scutil.c
View File

@@ -126,20 +126,16 @@ int build_apdu(sc_context_t *ctx, const u8 *buf, size_t len, sc_apdu_t *apdu)
if (!len) {
apdu->cse = SC_APDU_CASE_3_EXT;
} else {
if (len < 3) {
sc_error(ctx, "APDU too short (need %lu more bytes)\n",
(unsigned long) apdu->lc - len);
return SC_ERROR_INVALID_DATA;
}
if (*p++ != 0) {
sc_error(ctx, "Extended APDU needs Le, that begins with 0x00)\n");
/* at this point the apdu has a Lc, so Le is on 2 bytes */
if (len < 2) {
sc_error(ctx, "APDU too short (need 2 more bytes)\n");
return SC_ERROR_INVALID_DATA;
}
apdu->le = (*p++)<<8;
apdu->le += *p++;
if (apdu->le == 0)
apdu->le = 0xffff+1;
len -= 3;
len -= 2;
apdu->cse = SC_APDU_CASE_4_EXT;
}
}