deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

command chaining change

Browse Source
This commit is contained in:
NIIBE Yutaka
2012-02-02 12:18:47 +09:00
parent aff9080b35
commit 3d732a7c2d
2 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2012-01-30 Niibe Yutaka <gniibe@fsij.org>
* src/usb-icc.c (struct ccid): Add chained_cls_ins_p1_p2.
(end_cmd_apdu_head, icc_cmd_apdu_data, icc_handle_data): Add checking
CMD APDU head for command chaining.
2012-01-20 Niibe Yutaka <gniibe@fsij.org>
Short APDU only CCID driver.

56
src/usb-icc.c
View File

@@ -191,6 +191,7 @@ struct ccid {
struct icc_header icc_header;
uint8_t sw1sw2[2];
uint8_t chained_cls_ins_p1_p2[4];
Thread *icc_thread;
Thread *application;
@@ -444,7 +445,29 @@ static int end_cmd_apdu_head (struct ep_out *epo, size_t orig_len)
(void)orig_len;
if (epo->cnt < 4 || epo->cnt != c->icc_header.data_len)
epo->err = 1;
{
epo->err = 1;
return 0;
}
if ((c->state == APDU_STATE_COMMAND_CHAINING)
&& (c->chained_cls_ins_p1_p2[0] != (c->a->cmd_apdu_head[0] & ~0x10)
|| c->chained_cls_ins_p1_p2[1] != c->a->cmd_apdu_head[1]
|| c->chained_cls_ins_p1_p2[2] != c->a->cmd_apdu_head[2]
|| c->chained_cls_ins_p1_p2[3] != c->a->cmd_apdu_head[3]))
/*
* Handling exceptional request.
*
* Host stops sending command APDU using command chaining,
* and start another command APDU.
*
* Discard old one, and start handling new one.
*/
{
c->state = APDU_STATE_WAIT_COMMAND;
c->p = c->a->cmd_apdu_data;
c->len = MAX_CMD_APDU_DATA_SIZE;
}
if (epo->cnt == 4)
{
@@ -542,6 +565,27 @@ static void icc_cmd_apdu_data (struct ep_out *epo, size_t len)
c->p = c->a->cmd_apdu_data;
c->len = MAX_CMD_APDU_DATA_SIZE;
}
else if (c->state == APDU_STATE_COMMAND_CHAINING)
{
if (c->chained_cls_ins_p1_p2[0] != (c->a->cmd_apdu_head[0] & ~0x10)
|| c->chained_cls_ins_p1_p2[1] != c->a->cmd_apdu_head[1]
|| c->chained_cls_ins_p1_p2[2] != c->a->cmd_apdu_head[2]
|| c->chained_cls_ins_p1_p2[3] != c->a->cmd_apdu_head[3])
/*
* Handling exceptional request.
*
* Host stops sending command APDU using command chaining,
* and start another command APDU.
*
* Discard old one, and start handling new one.
*/
{
c->state = APDU_STATE_WAIT_COMMAND;
c->p = c->a->cmd_apdu_data;
c->len = MAX_CMD_APDU_DATA_SIZE;
c->a->cmd_apdu_data_len = 0;
}
}
epo->end_rx = end_cmd_apdu_data;
epo->buf = c->p;
@@ -1088,9 +1132,15 @@ icc_handle_data (struct ccid *c)
next_state = ICC_STATE_EXECUTE;
}
}
else /* command chaining is ongoing*/
else
{
c->state = APDU_STATE_COMMAND_CHAINING;
if (c->state == APDU_STATE_WAIT_COMMAND)
{ /* command chaining is started */
c->a->cmd_apdu_head[0] &= ~0x10;
memcpy (c->chained_cls_ins_p1_p2, c->a->cmd_apdu_head, 4);
c->state = APDU_STATE_COMMAND_CHAINING;
}
c->p += c->a->cmd_apdu_head[4];
c->len -= c->a->cmd_apdu_head[4];
icc_send_data_block_0x9000 (c);