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

ICC->CCID

Browse Source
This commit is contained in:
NIIBE Yutaka
2016-05-31 19:51:07 +09:00
parent 38d164360c
commit eb90074e11
6 changed files with 291 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gnuk.h
View File

@@ -43,7 +43,7 @@ void ccid_usb_reset (void);
/* Maximum res apdu data is public key 5+9+512 (gpg_do_public_key) */ /* Maximum res apdu data is public key 5+9+512 (gpg_do_public_key) */
#define MAX_RES_APDU_DATA_SIZE (5+9+512) /* without trailer */ #define MAX_RES_APDU_DATA_SIZE (5+9+512) /* without trailer */
#define ICC_MSG_HEADER_SIZE 10 #define CCID_MSG_HEADER_SIZE 10
#define res_APDU apdu.res_apdu_data #define res_APDU apdu.res_apdu_data
#define res_APDU_size apdu.res_apdu_data_len #define res_APDU_size apdu.res_apdu_data_len
@@ -51,22 +51,22 @@ void ccid_usb_reset (void);
/* USB buffer size of LL (Low-level): size of single Bulk transaction */ /* USB buffer size of LL (Low-level): size of single Bulk transaction */
#define USB_LL_BUF_SIZE 64 #define USB_LL_BUF_SIZE 64
enum icc_state { enum ccid_state {
ICC_STATE_NOCARD, /* No card available */ CCID_STATE_NOCARD, /* No card available */
ICC_STATE_START, /* Initial */ CCID_STATE_START, /* Initial */
ICC_STATE_WAIT, /* Waiting APDU */ CCID_STATE_WAIT, /* Waiting APDU */
/* Busy1, Busy2, Busy3, Busy5 */ /* Busy1, Busy2, Busy3, Busy5 */
ICC_STATE_EXECUTE, /* Busy4 */ CCID_STATE_EXECUTE, /* Busy4 */
ICC_STATE_RECEIVE, /* APDU Received Partially */ CCID_STATE_RECEIVE, /* APDU Received Partially */
ICC_STATE_SEND, /* APDU Sent Partially */ CCID_STATE_SEND, /* APDU Sent Partially */
ICC_STATE_EXITED, /* ICC Thread Terminated */ CCID_STATE_EXITED, /* ICC Thread Terminated */
ICC_STATE_EXEC_REQUESTED, /* Exec requested */ CCID_STATE_EXEC_REQUESTED, /* Exec requested */
}; };
#define CCID_CARD_INIT CARD_CHANGE_INSERT #define CCID_CARD_INIT CARD_CHANGE_INSERT
extern enum icc_state *icc_state_p; extern enum ccid_state *ccid_state_p;
extern volatile uint8_t auth_status; extern volatile uint8_t auth_status;
#define AC_NONE_AUTHORIZED 0x00 #define AC_NONE_AUTHORIZED 0x00

8
src/main.c
View File

@@ -130,9 +130,9 @@ static void emit_led (int on_time, int off_time)
static void display_status_code (void) static void display_status_code (void)
{ {
enum icc_state icc_state = *icc_state_p; enum ccid_state ccid_state = *ccid_state_p;
if (icc_state == ICC_STATE_START) if (ccid_state == CCID_STATE_START)
emit_led (LED_TIMEOUT_ONE, LED_TIMEOUT_STOP); emit_led (LED_TIMEOUT_ONE, LED_TIMEOUT_STOP);
else else
/* OpenPGP card thread is running */ /* OpenPGP card thread is running */
@@ -144,12 +144,12 @@ static void display_status_code (void)
emit_led ((auth_status & AC_PSO_CDS_AUTHORIZED)? emit_led ((auth_status & AC_PSO_CDS_AUTHORIZED)?
LED_TIMEOUT_ONE : LED_TIMEOUT_ZERO, LED_TIMEOUT_INTERVAL); LED_TIMEOUT_ONE : LED_TIMEOUT_ZERO, LED_TIMEOUT_INTERVAL);
if (icc_state == ICC_STATE_WAIT) if (ccid_state == CCID_STATE_WAIT)
chopstx_usec_wait (LED_TIMEOUT_STOP * 2); chopstx_usec_wait (LED_TIMEOUT_STOP * 2);
else else
{ {
chopstx_usec_wait (LED_TIMEOUT_INTERVAL); chopstx_usec_wait (LED_TIMEOUT_INTERVAL);
emit_led (icc_state == ICC_STATE_RECEIVE? emit_led (ccid_state == CCID_STATE_RECEIVE?
LED_TIMEOUT_ONE : LED_TIMEOUT_ZERO, LED_TIMEOUT_STOP); LED_TIMEOUT_ONE : LED_TIMEOUT_ZERO, LED_TIMEOUT_STOP);
} }
} }

504
src/usb-ccid.c
View File

@@ -137,45 +137,45 @@ static void epo_init (struct ep_out *epo, int ep_num,
* The buffer will be filled by multiple RX packets (Bulk-OUT) * The buffer will be filled by multiple RX packets (Bulk-OUT)
* or will be used for multiple TX packets (Bulk-IN) * or will be used for multiple TX packets (Bulk-IN)
*/ */
static uint8_t icc_buffer[USB_BUF_SIZE]; static uint8_t ccid_buffer[USB_BUF_SIZE];
#define ICC_SET_PARAMS 0x61 /* non-ICCD command */ #define CCID_SET_PARAMS 0x61 /* non-ICCD command */
#define ICC_POWER_ON 0x62 #define CCID_POWER_ON 0x62
#define ICC_POWER_OFF 0x63 #define CCID_POWER_OFF 0x63
#define ICC_SLOT_STATUS 0x65 /* non-ICCD command */ #define CCID_SLOT_STATUS 0x65 /* non-ICCD command */
#define ICC_SECURE 0x69 /* non-ICCD command */ #define CCID_SECURE 0x69 /* non-ICCD command */
#define ICC_GET_PARAMS 0x6C /* non-ICCD command */ #define CCID_GET_PARAMS 0x6C /* non-ICCD command */
#define ICC_RESET_PARAMS 0x6D /* non-ICCD command */ #define CCID_RESET_PARAMS 0x6D /* non-ICCD command */
#define ICC_XFR_BLOCK 0x6F #define CCID_XFR_BLOCK 0x6F
#define ICC_DATA_BLOCK_RET 0x80 #define CCID_DATA_BLOCK_RET 0x80
#define ICC_SLOT_STATUS_RET 0x81 /* non-ICCD result */ #define CCID_SLOT_STATUS_RET 0x81 /* non-ICCD result */
#define ICC_PARAMS_RET 0x82 /* non-ICCD result */ #define CCID_PARAMS_RET 0x82 /* non-ICCD result */
#define ICC_MSG_SEQ_OFFSET 6 #define CCID_MSG_SEQ_OFFSET 6
#define ICC_MSG_STATUS_OFFSET 7 #define CCID_MSG_STATUS_OFFSET 7
#define ICC_MSG_ERROR_OFFSET 8 #define CCID_MSG_ERROR_OFFSET 8
#define ICC_MSG_CHAIN_OFFSET 9 #define CCID_MSG_CHAIN_OFFSET 9
#define ICC_MSG_DATA_OFFSET 10 /* == ICC_MSG_HEADER_SIZE */ #define CCID_MSG_DATA_OFFSET 10 /* == CCID_MSG_HEADER_SIZE */
#define ICC_MAX_MSG_DATA_SIZE USB_BUF_SIZE #define CCID_MAX_MSG_DATA_SIZE USB_BUF_SIZE
#define ICC_STATUS_RUN 0x00 #define CCID_STATUS_RUN 0x00
#define ICC_STATUS_PRESENT 0x01 #define CCID_STATUS_PRESENT 0x01
#define ICC_STATUS_NOTPRESENT 0x02 #define CCID_STATUS_NOTPRESENT 0x02
#define ICC_CMD_STATUS_OK 0x00 #define CCID_CMD_STATUS_OK 0x00
#define ICC_CMD_STATUS_ERROR 0x40 #define CCID_CMD_STATUS_ERROR 0x40
#define ICC_CMD_STATUS_TIMEEXT 0x80 #define CCID_CMD_STATUS_TIMEEXT 0x80
#define ICC_ERROR_XFR_OVERRUN 0xFC #define CCID_ERROR_XFR_OVERRUN 0xFC
/* /*
* Since command-byte is at offset 0, * Since command-byte is at offset 0,
* error with offset 0 means "command not supported". * error with offset 0 means "command not supported".
*/ */
#define ICC_OFFSET_CMD_NOT_SUPPORTED 0 #define CCID_OFFSET_CMD_NOT_SUPPORTED 0
#define ICC_OFFSET_DATA_LEN 1 #define CCID_OFFSET_DATA_LEN 1
#define ICC_OFFSET_PARAM 8 #define CCID_OFFSET_PARAM 8
struct icc_header { struct ccid_header {
uint8_t msg_type; uint8_t msg_type;
uint32_t data_len; uint32_t data_len;
uint8_t slot; uint8_t slot;
@@ -187,14 +187,14 @@ struct icc_header {
/* Data structure handled by CCID layer */ /* Data structure handled by CCID layer */
struct ccid { struct ccid {
enum icc_state icc_state; enum ccid_state ccid_state;
uint8_t state; uint8_t state;
uint8_t *p; uint8_t *p;
size_t len; size_t len;
uint8_t err; uint8_t err;
struct icc_header icc_header; struct ccid_header ccid_header;
uint8_t sw1sw2[2]; uint8_t sw1sw2[2];
uint8_t chained_cls_ins_p1_p2[4]; uint8_t chained_cls_ins_p1_p2[4];
@@ -256,14 +256,14 @@ static void ccid_reset (struct ccid *c)
static void ccid_init (struct ccid *c, struct ep_in *epi, struct ep_out *epo, static void ccid_init (struct ccid *c, struct ep_in *epi, struct ep_out *epo,
struct apdu *a) struct apdu *a)
{ {
icc_state_p = &c->icc_state; ccid_state_p = &c->ccid_state;
c->icc_state = ICC_STATE_NOCARD; c->ccid_state = CCID_STATE_NOCARD;
c->state = APDU_STATE_WAIT_COMMAND; c->state = APDU_STATE_WAIT_COMMAND;
c->p = a->cmd_apdu_data; c->p = a->cmd_apdu_data;
c->len = MAX_CMD_APDU_DATA_SIZE; c->len = MAX_CMD_APDU_DATA_SIZE;
c->err = 0; c->err = 0;
memset (&c->icc_header, 0, sizeof (struct icc_header)); memset (&c->ccid_header, 0, sizeof (struct ccid_header));
c->sw1sw2[0] = 0x90; c->sw1sw2[0] = 0x90;
c->sw1sw2[1] = 0x00; c->sw1sw2[1] = 0x00;
c->application = 0; c->application = 0;
@@ -298,13 +298,13 @@ static void ccid_init (struct ccid *c, struct ep_in *epi, struct ep_out *epo,
static void apdu_init (struct apdu *a) static void apdu_init (struct apdu *a)
{ {
a->seq = 0; /* will be set by lower layer */ a->seq = 0; /* will be set by lower layer */
a->cmd_apdu_head = &icc_buffer[0]; a->cmd_apdu_head = &ccid_buffer[0];
a->cmd_apdu_data = &icc_buffer[5]; a->cmd_apdu_data = &ccid_buffer[5];
a->cmd_apdu_data_len = 0; /* will be set by lower layer */ a->cmd_apdu_data_len = 0; /* will be set by lower layer */
a->expected_res_size = 0; /* will be set by lower layer */ a->expected_res_size = 0; /* will be set by lower layer */
a->sw = 0x9000; /* will be set by upper layer */ a->sw = 0x9000; /* will be set by upper layer */
a->res_apdu_data = &icc_buffer[5]; /* will be set by upper layer */ a->res_apdu_data = &ccid_buffer[5]; /* will be set by upper layer */
a->res_apdu_data_len = 0; /* will be set by upper layer */ a->res_apdu_data_len = 0; /* will be set by upper layer */
} }
@@ -410,10 +410,10 @@ static void notify_icc (struct ep_out *epo)
eventflag_signal (&c->ccid_comm, EV_RX_DATA_READY); eventflag_signal (&c->ccid_comm, EV_RX_DATA_READY);
} }
static int end_icc_rx (struct ep_out *epo, size_t orig_len) static int end_ccid_rx (struct ep_out *epo, size_t orig_len)
{ {
(void)orig_len; (void)orig_len;
if (epo->cnt < sizeof (struct icc_header)) if (epo->cnt < sizeof (struct ccid_header))
/* short packet, just ignore */ /* short packet, just ignore */
return 1; return 1;
@@ -426,11 +426,11 @@ static int end_abdata (struct ep_out *epo, size_t orig_len)
struct ccid *c = (struct ccid *)epo->priv; struct ccid *c = (struct ccid *)epo->priv;
size_t len = epo->cnt; size_t len = epo->cnt;
if (orig_len == USB_LL_BUF_SIZE && len < c->icc_header.data_len) if (orig_len == USB_LL_BUF_SIZE && len < c->ccid_header.data_len)
/* more packet comes */ /* more packet comes */
return 1; return 1;
if (len != c->icc_header.data_len) if (len != c->ccid_header.data_len)
epo->err = 1; epo->err = 1;
return 0; return 0;
@@ -442,7 +442,7 @@ static int end_cmd_apdu_head (struct ep_out *epo, size_t orig_len)
(void)orig_len; (void)orig_len;
if (epo->cnt < 4 || epo->cnt != c->icc_header.data_len) if (epo->cnt < 4 || epo->cnt != c->ccid_header.data_len)
{ {
epo->err = 1; epo->err = 1;
return 0; return 0;
@@ -500,11 +500,11 @@ static int end_cmd_apdu_data (struct ep_out *epo, size_t orig_len)
size_t len = epo->cnt; size_t len = epo->cnt;
if (orig_len == USB_LL_BUF_SIZE if (orig_len == USB_LL_BUF_SIZE
&& CMD_APDU_HEAD_SIZE + len < c->icc_header.data_len) && CMD_APDU_HEAD_SIZE + len < c->ccid_header.data_len)
/* more packet comes */ /* more packet comes */
return 1; return 1;
if (CMD_APDU_HEAD_SIZE + len != c->icc_header.data_len) if (CMD_APDU_HEAD_SIZE + len != c->ccid_header.data_len)
goto error; goto error;
if (len == c->a->cmd_apdu_head[4]) if (len == c->a->cmd_apdu_head[4])
@@ -543,7 +543,7 @@ static void nomore_data (struct ep_out *epo, size_t len)
#define INS_GET_RESPONSE 0xc0 #define INS_GET_RESPONSE 0xc0
static void icc_cmd_apdu_data (struct ep_out *epo, size_t len) static void ccid_cmd_apdu_data (struct ep_out *epo, size_t len)
{ {
struct ccid *c = (struct ccid *)epo->priv; struct ccid *c = (struct ccid *)epo->priv;
@@ -591,20 +591,20 @@ static void icc_cmd_apdu_data (struct ep_out *epo, size_t len)
epo->next_buf = nomore_data; epo->next_buf = nomore_data;
} }
static void icc_abdata (struct ep_out *epo, size_t len) static void ccid_abdata (struct ep_out *epo, size_t len)
{ {
struct ccid *c = (struct ccid *)epo->priv; struct ccid *c = (struct ccid *)epo->priv;
(void)len; (void)len;
c->a->seq = c->icc_header.seq; c->a->seq = c->ccid_header.seq;
if (c->icc_header.msg_type == ICC_XFR_BLOCK) if (c->ccid_header.msg_type == CCID_XFR_BLOCK)
{ {
c->a->seq = c->icc_header.seq; c->a->seq = c->ccid_header.seq;
epo->end_rx = end_cmd_apdu_head; epo->end_rx = end_cmd_apdu_head;
epo->buf = c->a->cmd_apdu_head; epo->buf = c->a->cmd_apdu_head;
epo->buf_len = 5; epo->buf_len = 5;
epo->cnt = 0; epo->cnt = 0;
epo->next_buf = icc_cmd_apdu_data; epo->next_buf = ccid_cmd_apdu_data;
} }
else else
{ {
@@ -618,14 +618,14 @@ static void icc_abdata (struct ep_out *epo, size_t len)
static void static void
icc_prepare_receive (struct ccid *c) ccid_prepare_receive (struct ccid *c)
{ {
c->epo->err = 0; c->epo->err = 0;
c->epo->buf = (uint8_t *)&c->icc_header; c->epo->buf = (uint8_t *)&c->ccid_header;
c->epo->buf_len = sizeof (struct icc_header); c->epo->buf_len = sizeof (struct ccid_header);
c->epo->cnt = 0; c->epo->cnt = 0;
c->epo->next_buf = icc_abdata; c->epo->next_buf = ccid_abdata;
c->epo->end_rx = end_icc_rx; c->epo->end_rx = end_ccid_rx;
usb_lld_rx_enable (c->epo->ep_num); usb_lld_rx_enable (c->epo->ep_num);
DEBUG_INFO ("Rx ready\r\n"); DEBUG_INFO ("Rx ready\r\n");
} }
@@ -752,31 +752,31 @@ static const uint8_t ATR[] = {
/* /*
* Send back error * Send back error
*/ */
static void icc_error (struct ccid *c, int offset) static void ccid_error (struct ccid *c, int offset)
{ {
uint8_t icc_reply[ICC_MSG_HEADER_SIZE]; uint8_t ccid_reply[CCID_MSG_HEADER_SIZE];
icc_reply[0] = ICC_SLOT_STATUS_RET; /* Any value should be OK */ ccid_reply[0] = CCID_SLOT_STATUS_RET; /* Any value should be OK */
icc_reply[1] = 0x00; ccid_reply[1] = 0x00;
icc_reply[2] = 0x00; ccid_reply[2] = 0x00;
icc_reply[3] = 0x00; ccid_reply[3] = 0x00;
icc_reply[4] = 0x00; ccid_reply[4] = 0x00;
icc_reply[5] = 0x00; /* Slot */ ccid_reply[5] = 0x00; /* Slot */
icc_reply[ICC_MSG_SEQ_OFFSET] = c->icc_header.seq; ccid_reply[CCID_MSG_SEQ_OFFSET] = c->ccid_header.seq;
if (c->icc_state == ICC_STATE_NOCARD) if (c->ccid_state == CCID_STATE_NOCARD)
icc_reply[ICC_MSG_STATUS_OFFSET] = 2; /* 2: No ICC present */ ccid_reply[CCID_MSG_STATUS_OFFSET] = 2; /* 2: No ICC present */
else if (c->icc_state == ICC_STATE_START) else if (c->ccid_state == CCID_STATE_START)
icc_reply[ICC_MSG_STATUS_OFFSET] = 1; /* 1: ICC present but not activated */ ccid_reply[CCID_MSG_STATUS_OFFSET] = 1; /* 1: ICC present but not activated */
else else
icc_reply[ICC_MSG_STATUS_OFFSET] = 0; /* An ICC is present and active */ ccid_reply[CCID_MSG_STATUS_OFFSET] = 0; /* An ICC is present and active */
icc_reply[ICC_MSG_STATUS_OFFSET] |= ICC_CMD_STATUS_ERROR; /* Failed */ ccid_reply[CCID_MSG_STATUS_OFFSET] |= CCID_CMD_STATUS_ERROR; /* Failed */
icc_reply[ICC_MSG_ERROR_OFFSET] = offset; ccid_reply[CCID_MSG_ERROR_OFFSET] = offset;
icc_reply[ICC_MSG_CHAIN_OFFSET] = 0x00; ccid_reply[CCID_MSG_CHAIN_OFFSET] = 0x00;
/* This is a single packet Bulk-IN transaction */ /* This is a single packet Bulk-IN transaction */
c->epi->buf = NULL; c->epi->buf = NULL;
c->epi->tx_done = 1; c->epi->tx_done = 1;
usb_lld_write (c->epi->ep_num, icc_reply, ICC_MSG_HEADER_SIZE); usb_lld_write (c->epi->ep_num, ccid_reply, CCID_MSG_HEADER_SIZE);
} }
extern void *openpgp_card_thread (void *arg); extern void *openpgp_card_thread (void *arg);
@@ -788,65 +788,65 @@ const size_t __stacksize_gpg = (size_t)&__process3_stack_size__;
/* Send back ATR (Answer To Reset) */ /* Send back ATR (Answer To Reset) */
static enum icc_state static enum ccid_state
icc_power_on (struct ccid *c) ccid_power_on (struct ccid *c)
{ {
size_t size_atr = sizeof (ATR); size_t size_atr = sizeof (ATR);
uint8_t p[ICC_MSG_HEADER_SIZE]; uint8_t p[CCID_MSG_HEADER_SIZE];
if (c->application == 0) if (c->application == 0)
c->application = chopstx_create (PRIO_GPG, __stackaddr_gpg, c->application = chopstx_create (PRIO_GPG, __stackaddr_gpg,
__stacksize_gpg, openpgp_card_thread, __stacksize_gpg, openpgp_card_thread,
(void *)&c->ccid_comm); (void *)&c->ccid_comm);
p[0] = ICC_DATA_BLOCK_RET; p[0] = CCID_DATA_BLOCK_RET;
p[1] = size_atr; p[1] = size_atr;
p[2] = 0x00; p[2] = 0x00;
p[3] = 0x00; p[3] = 0x00;
p[4] = 0x00; p[4] = 0x00;
p[5] = 0x00; /* Slot */ p[5] = 0x00; /* Slot */
p[ICC_MSG_SEQ_OFFSET] = c->icc_header.seq; p[CCID_MSG_SEQ_OFFSET] = c->ccid_header.seq;
p[ICC_MSG_STATUS_OFFSET] = 0x00; p[CCID_MSG_STATUS_OFFSET] = 0x00;
p[ICC_MSG_ERROR_OFFSET] = 0x00; p[CCID_MSG_ERROR_OFFSET] = 0x00;
p[ICC_MSG_CHAIN_OFFSET] = 0x00; p[CCID_MSG_CHAIN_OFFSET] = 0x00;
usb_lld_txcpy (p, c->epi->ep_num, 0, ICC_MSG_HEADER_SIZE); usb_lld_txcpy (p, c->epi->ep_num, 0, CCID_MSG_HEADER_SIZE);
usb_lld_txcpy (ATR, c->epi->ep_num, ICC_MSG_HEADER_SIZE, size_atr); usb_lld_txcpy (ATR, c->epi->ep_num, CCID_MSG_HEADER_SIZE, size_atr);
/* This is a single packet Bulk-IN transaction */ /* This is a single packet Bulk-IN transaction */
c->epi->buf = NULL; c->epi->buf = NULL;
c->epi->tx_done = 1; c->epi->tx_done = 1;
usb_lld_tx_enable (c->epi->ep_num, ICC_MSG_HEADER_SIZE + size_atr); usb_lld_tx_enable (c->epi->ep_num, CCID_MSG_HEADER_SIZE + size_atr);
DEBUG_INFO ("ON\r\n"); DEBUG_INFO ("ON\r\n");
return ICC_STATE_WAIT; return CCID_STATE_WAIT;
} }
static void static void
icc_send_status (struct ccid *c) ccid_send_status (struct ccid *c)
{ {
uint8_t icc_reply[ICC_MSG_HEADER_SIZE]; uint8_t ccid_reply[CCID_MSG_HEADER_SIZE];
icc_reply[0] = ICC_SLOT_STATUS_RET; ccid_reply[0] = CCID_SLOT_STATUS_RET;
icc_reply[1] = 0x00; ccid_reply[1] = 0x00;
icc_reply[2] = 0x00; ccid_reply[2] = 0x00;
icc_reply[3] = 0x00; ccid_reply[3] = 0x00;
icc_reply[4] = 0x00; ccid_reply[4] = 0x00;
icc_reply[5] = 0x00; /* Slot */ ccid_reply[5] = 0x00; /* Slot */
icc_reply[ICC_MSG_SEQ_OFFSET] = c->icc_header.seq; ccid_reply[CCID_MSG_SEQ_OFFSET] = c->ccid_header.seq;
if (c->icc_state == ICC_STATE_NOCARD) if (c->ccid_state == CCID_STATE_NOCARD)
icc_reply[ICC_MSG_STATUS_OFFSET] = 2; /* 2: No ICC present */ ccid_reply[CCID_MSG_STATUS_OFFSET] = 2; /* 2: No ICC present */
else if (c->icc_state == ICC_STATE_START) else if (c->ccid_state == CCID_STATE_START)
icc_reply[ICC_MSG_STATUS_OFFSET] = 1; /* 1: ICC present but not activated */ ccid_reply[CCID_MSG_STATUS_OFFSET] = 1; /* 1: ICC present but not activated */
else else
icc_reply[ICC_MSG_STATUS_OFFSET] = 0; /* An ICC is present and active */ ccid_reply[CCID_MSG_STATUS_OFFSET] = 0; /* An ICC is present and active */
icc_reply[ICC_MSG_ERROR_OFFSET] = 0x00; ccid_reply[CCID_MSG_ERROR_OFFSET] = 0x00;
icc_reply[ICC_MSG_CHAIN_OFFSET] = 0x00; ccid_reply[CCID_MSG_CHAIN_OFFSET] = 0x00;
/* This is a single packet Bulk-IN transaction */ /* This is a single packet Bulk-IN transaction */
c->epi->buf = NULL; c->epi->buf = NULL;
c->epi->tx_done = 1; c->epi->tx_done = 1;
usb_lld_write (c->epi->ep_num, icc_reply, ICC_MSG_HEADER_SIZE); usb_lld_write (c->epi->ep_num, ccid_reply, CCID_MSG_HEADER_SIZE);
led_blink (LED_SHOW_STATUS); led_blink (LED_SHOW_STATUS);
#ifdef DEBUG_MORE #ifdef DEBUG_MORE
@@ -854,8 +854,8 @@ icc_send_status (struct ccid *c)
#endif #endif
} }
static enum icc_state static enum ccid_state
icc_power_off (struct ccid *c) ccid_power_off (struct ccid *c)
{ {
if (c->application) if (c->application)
{ {
@@ -864,17 +864,17 @@ icc_power_off (struct ccid *c)
c->application = 0; c->application = 0;
} }
c->icc_state = ICC_STATE_START; /* This status change should be here */ c->ccid_state = CCID_STATE_START; /* This status change should be here */
icc_send_status (c); ccid_send_status (c);
DEBUG_INFO ("OFF\r\n"); DEBUG_INFO ("OFF\r\n");
return ICC_STATE_START; return CCID_STATE_START;
} }
static void static void
icc_send_data_block_internal (struct ccid *c, uint8_t status, uint8_t error) ccid_send_data_block_internal (struct ccid *c, uint8_t status, uint8_t error)
{ {
int tx_size = USB_LL_BUF_SIZE; int tx_size = USB_LL_BUF_SIZE;
uint8_t p[ICC_MSG_HEADER_SIZE]; uint8_t p[CCID_MSG_HEADER_SIZE];
size_t len; size_t len;
if (status == 0) if (status == 0)
@@ -882,50 +882,50 @@ icc_send_data_block_internal (struct ccid *c, uint8_t status, uint8_t error)
else else
len = 0; len = 0;
p[0] = ICC_DATA_BLOCK_RET; p[0] = CCID_DATA_BLOCK_RET;
p[1] = len & 0xFF; p[1] = len & 0xFF;
p[2] = (len >> 8)& 0xFF; p[2] = (len >> 8)& 0xFF;
p[3] = (len >> 16)& 0xFF; p[3] = (len >> 16)& 0xFF;
p[4] = (len >> 24)& 0xFF; p[4] = (len >> 24)& 0xFF;
p[5] = 0x00; /* Slot */ p[5] = 0x00; /* Slot */
p[ICC_MSG_SEQ_OFFSET] = c->a->seq; p[CCID_MSG_SEQ_OFFSET] = c->a->seq;
p[ICC_MSG_STATUS_OFFSET] = status; p[CCID_MSG_STATUS_OFFSET] = status;
p[ICC_MSG_ERROR_OFFSET] = error; p[CCID_MSG_ERROR_OFFSET] = error;
p[ICC_MSG_CHAIN_OFFSET] = 0; p[CCID_MSG_CHAIN_OFFSET] = 0;
usb_lld_txcpy (p, c->epi->ep_num, 0, ICC_MSG_HEADER_SIZE); usb_lld_txcpy (p, c->epi->ep_num, 0, CCID_MSG_HEADER_SIZE);
if (len == 0) if (len == 0)
{ {
usb_lld_tx_enable (c->epi->ep_num, ICC_MSG_HEADER_SIZE); usb_lld_tx_enable (c->epi->ep_num, CCID_MSG_HEADER_SIZE);
return; return;
} }
if (ICC_MSG_HEADER_SIZE + len <= USB_LL_BUF_SIZE) if (CCID_MSG_HEADER_SIZE + len <= USB_LL_BUF_SIZE)
{ {
usb_lld_txcpy (c->a->res_apdu_data, c->epi->ep_num, usb_lld_txcpy (c->a->res_apdu_data, c->epi->ep_num,
ICC_MSG_HEADER_SIZE, c->a->res_apdu_data_len); CCID_MSG_HEADER_SIZE, c->a->res_apdu_data_len);
usb_lld_txcpy (c->sw1sw2, c->epi->ep_num, usb_lld_txcpy (c->sw1sw2, c->epi->ep_num,
ICC_MSG_HEADER_SIZE + c->a->res_apdu_data_len, 2); CCID_MSG_HEADER_SIZE + c->a->res_apdu_data_len, 2);
c->epi->buf = NULL; c->epi->buf = NULL;
if (ICC_MSG_HEADER_SIZE + len < USB_LL_BUF_SIZE) if (CCID_MSG_HEADER_SIZE + len < USB_LL_BUF_SIZE)
c->epi->tx_done = 1; c->epi->tx_done = 1;
tx_size = ICC_MSG_HEADER_SIZE + len; tx_size = CCID_MSG_HEADER_SIZE + len;
} }
else if (ICC_MSG_HEADER_SIZE + len - 1 == USB_LL_BUF_SIZE) else if (CCID_MSG_HEADER_SIZE + len - 1 == USB_LL_BUF_SIZE)
{ {
usb_lld_txcpy (c->a->res_apdu_data, c->epi->ep_num, usb_lld_txcpy (c->a->res_apdu_data, c->epi->ep_num,
ICC_MSG_HEADER_SIZE, c->a->res_apdu_data_len); CCID_MSG_HEADER_SIZE, c->a->res_apdu_data_len);
usb_lld_txcpy (c->sw1sw2, c->epi->ep_num, usb_lld_txcpy (c->sw1sw2, c->epi->ep_num,
ICC_MSG_HEADER_SIZE + c->a->res_apdu_data_len, 1); CCID_MSG_HEADER_SIZE + c->a->res_apdu_data_len, 1);
c->epi->buf = &c->sw1sw2[1]; c->epi->buf = &c->sw1sw2[1];
c->epi->cnt = 1; c->epi->cnt = 1;
c->epi->buf_len = 1; c->epi->buf_len = 1;
c->epi->next_buf = no_buf; c->epi->next_buf = no_buf;
} }
else if (ICC_MSG_HEADER_SIZE + len - 2 == USB_LL_BUF_SIZE) else if (CCID_MSG_HEADER_SIZE + len - 2 == USB_LL_BUF_SIZE)
{ {
usb_lld_txcpy (c->a->res_apdu_data, c->epi->ep_num, usb_lld_txcpy (c->a->res_apdu_data, c->epi->ep_num,
ICC_MSG_HEADER_SIZE, c->a->res_apdu_data_len); CCID_MSG_HEADER_SIZE, c->a->res_apdu_data_len);
c->epi->buf = &c->sw1sw2[0]; c->epi->buf = &c->sw1sw2[0];
c->epi->cnt = 0; c->epi->cnt = 0;
c->epi->buf_len = 2; c->epi->buf_len = 2;
@@ -933,12 +933,12 @@ icc_send_data_block_internal (struct ccid *c, uint8_t status, uint8_t error)
} }
else else
{ {
usb_lld_txcpy (c->a->res_apdu_data, c->epi->ep_num, ICC_MSG_HEADER_SIZE, usb_lld_txcpy (c->a->res_apdu_data, c->epi->ep_num, CCID_MSG_HEADER_SIZE,
USB_LL_BUF_SIZE - ICC_MSG_HEADER_SIZE); USB_LL_BUF_SIZE - CCID_MSG_HEADER_SIZE);
c->epi->buf = c->a->res_apdu_data + USB_LL_BUF_SIZE - ICC_MSG_HEADER_SIZE; c->epi->buf = c->a->res_apdu_data + USB_LL_BUF_SIZE - CCID_MSG_HEADER_SIZE;
c->epi->cnt = USB_LL_BUF_SIZE - ICC_MSG_HEADER_SIZE; c->epi->cnt = USB_LL_BUF_SIZE - CCID_MSG_HEADER_SIZE;
c->epi->buf_len = c->a->res_apdu_data_len c->epi->buf_len = c->a->res_apdu_data_len
- (USB_LL_BUF_SIZE - ICC_MSG_HEADER_SIZE); - (USB_LL_BUF_SIZE - CCID_MSG_HEADER_SIZE);
c->epi->next_buf = get_sw1sw2; c->epi->next_buf = get_sw1sw2;
} }
@@ -949,41 +949,41 @@ icc_send_data_block_internal (struct ccid *c, uint8_t status, uint8_t error)
} }
static void static void
icc_send_data_block (struct ccid *c) ccid_send_data_block (struct ccid *c)
{ {
icc_send_data_block_internal (c, 0, 0); ccid_send_data_block_internal (c, 0, 0);
} }
static void static void
icc_send_data_block_time_extension (struct ccid *c) ccid_send_data_block_time_extension (struct ccid *c)
{ {
icc_send_data_block_internal (c, ICC_CMD_STATUS_TIMEEXT, 1); ccid_send_data_block_internal (c, CCID_CMD_STATUS_TIMEEXT, 1);
} }
static void static void
icc_send_data_block_0x9000 (struct ccid *c) ccid_send_data_block_0x9000 (struct ccid *c)
{ {
uint8_t p[ICC_MSG_HEADER_SIZE+2]; uint8_t p[CCID_MSG_HEADER_SIZE+2];
size_t len = 2; size_t len = 2;
p[0] = ICC_DATA_BLOCK_RET; p[0] = CCID_DATA_BLOCK_RET;
p[1] = len & 0xFF; p[1] = len & 0xFF;
p[2] = (len >> 8)& 0xFF; p[2] = (len >> 8)& 0xFF;
p[3] = (len >> 16)& 0xFF; p[3] = (len >> 16)& 0xFF;
p[4] = (len >> 24)& 0xFF; p[4] = (len >> 24)& 0xFF;
p[5] = 0x00; /* Slot */ p[5] = 0x00; /* Slot */
p[ICC_MSG_SEQ_OFFSET] = c->a->seq; p[CCID_MSG_SEQ_OFFSET] = c->a->seq;
p[ICC_MSG_STATUS_OFFSET] = 0; p[CCID_MSG_STATUS_OFFSET] = 0;
p[ICC_MSG_ERROR_OFFSET] = 0; p[CCID_MSG_ERROR_OFFSET] = 0;
p[ICC_MSG_CHAIN_OFFSET] = 0; p[CCID_MSG_CHAIN_OFFSET] = 0;
p[ICC_MSG_CHAIN_OFFSET+1] = 0x90; p[CCID_MSG_CHAIN_OFFSET+1] = 0x90;
p[ICC_MSG_CHAIN_OFFSET+2] = 0x00; p[CCID_MSG_CHAIN_OFFSET+2] = 0x00;
usb_lld_txcpy (p, c->epi->ep_num, 0, ICC_MSG_HEADER_SIZE + len); usb_lld_txcpy (p, c->epi->ep_num, 0, CCID_MSG_HEADER_SIZE + len);
c->epi->buf = NULL; c->epi->buf = NULL;
c->epi->tx_done = 1; c->epi->tx_done = 1;
usb_lld_tx_enable (c->epi->ep_num, ICC_MSG_HEADER_SIZE + len); usb_lld_tx_enable (c->epi->ep_num, CCID_MSG_HEADER_SIZE + len);
#ifdef DEBUG_MORE #ifdef DEBUG_MORE
DEBUG_INFO ("DATA\r\n"); DEBUG_INFO ("DATA\r\n");
#endif #endif
@@ -993,43 +993,43 @@ icc_send_data_block_0x9000 (struct ccid *c)
* Reply to the host for "GET RESPONSE". * Reply to the host for "GET RESPONSE".
*/ */
static void static void
icc_send_data_block_gr (struct ccid *c, size_t chunk_len) ccid_send_data_block_gr (struct ccid *c, size_t chunk_len)
{ {
int tx_size = USB_LL_BUF_SIZE; int tx_size = USB_LL_BUF_SIZE;
uint8_t p[ICC_MSG_HEADER_SIZE]; uint8_t p[CCID_MSG_HEADER_SIZE];
size_t len = chunk_len + 2; size_t len = chunk_len + 2;
p[0] = ICC_DATA_BLOCK_RET; p[0] = CCID_DATA_BLOCK_RET;
p[1] = len & 0xFF; p[1] = len & 0xFF;
p[2] = (len >> 8)& 0xFF; p[2] = (len >> 8)& 0xFF;
p[3] = (len >> 16)& 0xFF; p[3] = (len >> 16)& 0xFF;
p[4] = (len >> 24)& 0xFF; p[4] = (len >> 24)& 0xFF;
p[5] = 0x00; /* Slot */ p[5] = 0x00; /* Slot */
p[ICC_MSG_SEQ_OFFSET] = c->a->seq; p[CCID_MSG_SEQ_OFFSET] = c->a->seq;
p[ICC_MSG_STATUS_OFFSET] = 0; p[CCID_MSG_STATUS_OFFSET] = 0;
p[ICC_MSG_ERROR_OFFSET] = 0; p[CCID_MSG_ERROR_OFFSET] = 0;
p[ICC_MSG_CHAIN_OFFSET] = 0; p[CCID_MSG_CHAIN_OFFSET] = 0;
usb_lld_txcpy (p, c->epi->ep_num, 0, ICC_MSG_HEADER_SIZE); usb_lld_txcpy (p, c->epi->ep_num, 0, CCID_MSG_HEADER_SIZE);
set_sw1sw2 (c, chunk_len); set_sw1sw2 (c, chunk_len);
if (chunk_len <= USB_LL_BUF_SIZE - ICC_MSG_HEADER_SIZE) if (chunk_len <= USB_LL_BUF_SIZE - CCID_MSG_HEADER_SIZE)
{ {
int size_for_sw; int size_for_sw;
if (chunk_len <= USB_LL_BUF_SIZE - ICC_MSG_HEADER_SIZE - 2) if (chunk_len <= USB_LL_BUF_SIZE - CCID_MSG_HEADER_SIZE - 2)
size_for_sw = 2; size_for_sw = 2;
else if (chunk_len == USB_LL_BUF_SIZE - ICC_MSG_HEADER_SIZE - 1) else if (chunk_len == USB_LL_BUF_SIZE - CCID_MSG_HEADER_SIZE - 1)
size_for_sw = 1; size_for_sw = 1;
else else
size_for_sw = 0; size_for_sw = 0;
usb_lld_txcpy (c->p, c->epi->ep_num, ICC_MSG_HEADER_SIZE, chunk_len); usb_lld_txcpy (c->p, c->epi->ep_num, CCID_MSG_HEADER_SIZE, chunk_len);
if (size_for_sw) if (size_for_sw)
usb_lld_txcpy (c->sw1sw2, c->epi->ep_num, usb_lld_txcpy (c->sw1sw2, c->epi->ep_num,
ICC_MSG_HEADER_SIZE + chunk_len, size_for_sw); CCID_MSG_HEADER_SIZE + chunk_len, size_for_sw);
tx_size = ICC_MSG_HEADER_SIZE + chunk_len + size_for_sw; tx_size = CCID_MSG_HEADER_SIZE + chunk_len + size_for_sw;
if (size_for_sw == 2) if (size_for_sw == 2)
{ {
c->epi->buf = NULL; c->epi->buf = NULL;
@@ -1047,11 +1047,11 @@ icc_send_data_block_gr (struct ccid *c, size_t chunk_len)
} }
else else
{ {
usb_lld_txcpy (c->p, c->epi->ep_num, ICC_MSG_HEADER_SIZE, usb_lld_txcpy (c->p, c->epi->ep_num, CCID_MSG_HEADER_SIZE,
USB_LL_BUF_SIZE - ICC_MSG_HEADER_SIZE); USB_LL_BUF_SIZE - CCID_MSG_HEADER_SIZE);
c->epi->buf = c->p + USB_LL_BUF_SIZE - ICC_MSG_HEADER_SIZE; c->epi->buf = c->p + USB_LL_BUF_SIZE - CCID_MSG_HEADER_SIZE;
c->epi->cnt = 0; c->epi->cnt = 0;
c->epi->buf_len = chunk_len - (USB_LL_BUF_SIZE - ICC_MSG_HEADER_SIZE); c->epi->buf_len = chunk_len - (USB_LL_BUF_SIZE - CCID_MSG_HEADER_SIZE);
c->epi->next_buf = get_sw1sw2; c->epi->next_buf = get_sw1sw2;
} }
@@ -1065,9 +1065,9 @@ icc_send_data_block_gr (struct ccid *c, size_t chunk_len)
static void static void
icc_send_params (struct ccid *c) ccid_send_params (struct ccid *c)
{ {
uint8_t p[ICC_MSG_HEADER_SIZE]; uint8_t p[CCID_MSG_HEADER_SIZE];
const uint8_t params[] = { const uint8_t params[] = {
0x11, /* bmFindexDindex */ 0x11, /* bmFindexDindex */
0x11, /* bmTCCKST1 */ 0x11, /* bmTCCKST1 */
@@ -1078,89 +1078,89 @@ icc_send_params (struct ccid *c)
0 /* bNadValue */ 0 /* bNadValue */
}; };
p[0] = ICC_PARAMS_RET; p[0] = CCID_PARAMS_RET;
p[1] = 0x07; /* Length = 0x00000007 */ p[1] = 0x07; /* Length = 0x00000007 */
p[2] = 0; p[2] = 0;
p[3] = 0; p[3] = 0;
p[4] = 0; p[4] = 0;
p[5] = 0x00; /* Slot */ p[5] = 0x00; /* Slot */
p[ICC_MSG_SEQ_OFFSET] = c->icc_header.seq; p[CCID_MSG_SEQ_OFFSET] = c->ccid_header.seq;
p[ICC_MSG_STATUS_OFFSET] = 0; p[CCID_MSG_STATUS_OFFSET] = 0;
p[ICC_MSG_ERROR_OFFSET] = 0; p[CCID_MSG_ERROR_OFFSET] = 0;
p[ICC_MSG_CHAIN_OFFSET] = 0x01; /* ProtocolNum: T=1 */ p[CCID_MSG_CHAIN_OFFSET] = 0x01; /* ProtocolNum: T=1 */
usb_lld_txcpy (p, c->epi->ep_num, 0, ICC_MSG_HEADER_SIZE); usb_lld_txcpy (p, c->epi->ep_num, 0, CCID_MSG_HEADER_SIZE);
usb_lld_txcpy (params, c->epi->ep_num, ICC_MSG_HEADER_SIZE, sizeof params); usb_lld_txcpy (params, c->epi->ep_num, CCID_MSG_HEADER_SIZE, sizeof params);
/* This is a single packet Bulk-IN transaction */ /* This is a single packet Bulk-IN transaction */
c->epi->buf = NULL; c->epi->buf = NULL;
c->epi->tx_done = 1; c->epi->tx_done = 1;
usb_lld_tx_enable (c->epi->ep_num, ICC_MSG_HEADER_SIZE + sizeof params); usb_lld_tx_enable (c->epi->ep_num, CCID_MSG_HEADER_SIZE + sizeof params);
#ifdef DEBUG_MORE #ifdef DEBUG_MORE
DEBUG_INFO ("PARAMS\r\n"); DEBUG_INFO ("PARAMS\r\n");
#endif #endif
} }
static enum icc_state static enum ccid_state
icc_handle_data (struct ccid *c) ccid_handle_data (struct ccid *c)
{ {
enum icc_state next_state = c->icc_state; enum ccid_state next_state = c->ccid_state;
if (c->err != 0) if (c->err != 0)
{ {
ccid_reset (c); ccid_reset (c);
icc_error (c, ICC_OFFSET_DATA_LEN); ccid_error (c, CCID_OFFSET_DATA_LEN);
return next_state; return next_state;
} }
switch (c->icc_state) switch (c->ccid_state)
{ {
case ICC_STATE_NOCARD: case CCID_STATE_NOCARD:
if (c->icc_header.msg_type == ICC_SLOT_STATUS) if (c->ccid_header.msg_type == CCID_SLOT_STATUS)
icc_send_status (c); ccid_send_status (c);
else else
{ {
DEBUG_INFO ("ERR00\r\n"); DEBUG_INFO ("ERR00\r\n");
icc_error (c, ICC_OFFSET_CMD_NOT_SUPPORTED); ccid_error (c, CCID_OFFSET_CMD_NOT_SUPPORTED);
} }
break; break;
case ICC_STATE_START: case CCID_STATE_START:
if (c->icc_header.msg_type == ICC_POWER_ON) if (c->ccid_header.msg_type == CCID_POWER_ON)
{ {
ccid_reset (c); ccid_reset (c);
next_state = icc_power_on (c); next_state = ccid_power_on (c);
} }
else if (c->icc_header.msg_type == ICC_POWER_OFF) else if (c->ccid_header.msg_type == CCID_POWER_OFF)
{ {
ccid_reset (c); ccid_reset (c);
next_state = icc_power_off (c); next_state = ccid_power_off (c);
} }
else if (c->icc_header.msg_type == ICC_SLOT_STATUS) else if (c->ccid_header.msg_type == CCID_SLOT_STATUS)
icc_send_status (c); ccid_send_status (c);
else else
{ {
DEBUG_INFO ("ERR01\r\n"); DEBUG_INFO ("ERR01\r\n");
icc_error (c, ICC_OFFSET_CMD_NOT_SUPPORTED); ccid_error (c, CCID_OFFSET_CMD_NOT_SUPPORTED);
} }
break; break;
case ICC_STATE_WAIT: case CCID_STATE_WAIT:
if (c->icc_header.msg_type == ICC_POWER_ON) if (c->ccid_header.msg_type == CCID_POWER_ON)
{ {
/* Not in the spec., but pcscd/libccid */ /* Not in the spec., but pcscd/libccid */
ccid_reset (c); ccid_reset (c);
next_state = icc_power_on (c); next_state = ccid_power_on (c);
} }
else if (c->icc_header.msg_type == ICC_POWER_OFF) else if (c->ccid_header.msg_type == CCID_POWER_OFF)
{ {
ccid_reset (c); ccid_reset (c);
next_state = icc_power_off (c); next_state = ccid_power_off (c);
} }
else if (c->icc_header.msg_type == ICC_SLOT_STATUS) else if (c->ccid_header.msg_type == CCID_SLOT_STATUS)
icc_send_status (c); ccid_send_status (c);
else if (c->icc_header.msg_type == ICC_XFR_BLOCK) else if (c->ccid_header.msg_type == CCID_XFR_BLOCK)
{ {
if (c->icc_header.param == 0) if (c->ccid_header.param == 0)
{ {
if ((c->a->cmd_apdu_head[0] & 0x10) == 0) if ((c->a->cmd_apdu_head[0] & 0x10) == 0)
{ {
@@ -1179,10 +1179,10 @@ icc_handle_data (struct ccid *c)
if (c->len <= c->a->expected_res_size) if (c->len <= c->a->expected_res_size)
len = c->len; len = c->len;
icc_send_data_block_gr (c, len); ccid_send_data_block_gr (c, len);
if (c->len == 0) if (c->len == 0)
c->state = APDU_STATE_RESULT; c->state = APDU_STATE_RESULT;
c->icc_state = ICC_STATE_WAIT; c->ccid_state = CCID_STATE_WAIT;
DEBUG_INFO ("GET Response.\r\n"); DEBUG_INFO ("GET Response.\r\n");
} }
else else
@@ -1191,10 +1191,10 @@ icc_handle_data (struct ccid *c)
c->a->sw = 0x9000; c->a->sw = 0x9000;
c->a->res_apdu_data_len = 0; c->a->res_apdu_data_len = 0;
c->a->res_apdu_data = &icc_buffer[5]; c->a->res_apdu_data = &ccid_buffer[5];
eventflag_signal (&c->openpgp_comm, EV_CMD_AVAILABLE); eventflag_signal (&c->openpgp_comm, EV_CMD_AVAILABLE);
next_state = ICC_STATE_EXECUTE; next_state = CCID_STATE_EXECUTE;
} }
} }
else else
@@ -1208,27 +1208,27 @@ icc_handle_data (struct ccid *c)
c->p += c->a->cmd_apdu_head[4]; c->p += c->a->cmd_apdu_head[4];
c->len -= c->a->cmd_apdu_head[4]; c->len -= c->a->cmd_apdu_head[4];
icc_send_data_block_0x9000 (c); ccid_send_data_block_0x9000 (c);
DEBUG_INFO ("CMD chaning...\r\n"); DEBUG_INFO ("CMD chaning...\r\n");
} }
} }
else else
{ /* ICC block chaining is not supported. */ { /* ICC block chaining is not supported. */
DEBUG_INFO ("ERR02\r\n"); DEBUG_INFO ("ERR02\r\n");
icc_error (c, ICC_OFFSET_PARAM); ccid_error (c, CCID_OFFSET_PARAM);
} }
} }
else if (c->icc_header.msg_type == ICC_SET_PARAMS else if (c->ccid_header.msg_type == CCID_SET_PARAMS
|| c->icc_header.msg_type == ICC_GET_PARAMS || c->ccid_header.msg_type == CCID_GET_PARAMS
|| c->icc_header.msg_type == ICC_RESET_PARAMS) || c->ccid_header.msg_type == CCID_RESET_PARAMS)
icc_send_params (c); ccid_send_params (c);
else if (c->icc_header.msg_type == ICC_SECURE) else if (c->ccid_header.msg_type == CCID_SECURE)
{ {
if (c->p != c->a->cmd_apdu_data) if (c->p != c->a->cmd_apdu_data)
{ {
/* SECURE received in the middle of command chaining */ /* SECURE received in the middle of command chaining */
ccid_reset (c); ccid_reset (c);
icc_error (c, ICC_OFFSET_DATA_LEN); ccid_error (c, CCID_OFFSET_DATA_LEN);
return next_state; return next_state;
} }
@@ -1254,7 +1254,7 @@ icc_handle_data (struct ccid *c)
c->a->res_apdu_data = &c->p[5]; c->a->res_apdu_data = &c->p[5];
eventflag_signal (&c->openpgp_comm, EV_VERIFY_CMD_AVAILABLE); eventflag_signal (&c->openpgp_comm, EV_VERIFY_CMD_AVAILABLE);
next_state = ICC_STATE_EXECUTE; next_state = CCID_STATE_EXECUTE;
} }
else if (c->p[10-10] == 0x01) /* PIN Modification */ else if (c->p[10-10] == 0x01) /* PIN Modification */
{ {
@@ -1285,35 +1285,35 @@ icc_handle_data (struct ccid *c)
c->a->sw = 0x9000; c->a->sw = 0x9000;
c->a->res_apdu_data_len = 0; c->a->res_apdu_data_len = 0;
c->a->res_apdu_data = &icc_buffer[5]; c->a->res_apdu_data = &ccid_buffer[5];
eventflag_signal (&c->openpgp_comm, EV_MODIFY_CMD_AVAILABLE); eventflag_signal (&c->openpgp_comm, EV_MODIFY_CMD_AVAILABLE);
next_state = ICC_STATE_EXECUTE; next_state = CCID_STATE_EXECUTE;
} }
else else
icc_error (c, ICC_MSG_DATA_OFFSET); ccid_error (c, CCID_MSG_DATA_OFFSET);
} }
else else
{ {
DEBUG_INFO ("ERR03\r\n"); DEBUG_INFO ("ERR03\r\n");
DEBUG_BYTE (c->icc_header.msg_type); DEBUG_BYTE (c->ccid_header.msg_type);
icc_error (c, ICC_OFFSET_CMD_NOT_SUPPORTED); ccid_error (c, CCID_OFFSET_CMD_NOT_SUPPORTED);
} }
break; break;
case ICC_STATE_EXECUTE: case CCID_STATE_EXECUTE:
if (c->icc_header.msg_type == ICC_POWER_OFF) if (c->ccid_header.msg_type == CCID_POWER_OFF)
next_state = icc_power_off (c); next_state = ccid_power_off (c);
else if (c->icc_header.msg_type == ICC_SLOT_STATUS) else if (c->ccid_header.msg_type == CCID_SLOT_STATUS)
icc_send_status (c); ccid_send_status (c);
else else
{ {
DEBUG_INFO ("ERR04\r\n"); DEBUG_INFO ("ERR04\r\n");
DEBUG_BYTE (c->icc_header.msg_type); DEBUG_BYTE (c->ccid_header.msg_type);
icc_error (c, ICC_OFFSET_CMD_NOT_SUPPORTED); ccid_error (c, CCID_OFFSET_CMD_NOT_SUPPORTED);
} }
break; break;
default: default:
next_state = ICC_STATE_START; next_state = CCID_STATE_START;
DEBUG_INFO ("ERR10\r\n"); DEBUG_INFO ("ERR10\r\n");
break; break;
} }
@@ -1321,15 +1321,15 @@ icc_handle_data (struct ccid *c)
return next_state; return next_state;
} }
static enum icc_state static enum ccid_state
icc_handle_timeout (struct ccid *c) ccid_handle_timeout (struct ccid *c)
{ {
enum icc_state next_state = c->icc_state; enum ccid_state next_state = c->ccid_state;
switch (c->icc_state) switch (c->ccid_state)
{ {
case ICC_STATE_EXECUTE: case CCID_STATE_EXECUTE:
icc_send_data_block_time_extension (c); ccid_send_data_block_time_extension (c);
break; break;
default: default:
break; break;
@@ -1340,7 +1340,7 @@ icc_handle_timeout (struct ccid *c)
} }
static struct ccid ccid; static struct ccid ccid;
enum icc_state *icc_state_p = &ccid.icc_state; enum ccid_state *ccid_state_p = &ccid.ccid_state;
void void
ccid_card_change_signal (int how) ccid_card_change_signal (int how)
@@ -1348,8 +1348,8 @@ ccid_card_change_signal (int how)
struct ccid *c = &ccid; struct ccid *c = &ccid;
if (how == CARD_CHANGE_TOGGLE if (how == CARD_CHANGE_TOGGLE
|| (c->icc_state == ICC_STATE_NOCARD && how == CARD_CHANGE_INSERT) || (c->ccid_state == CCID_STATE_NOCARD && how == CARD_CHANGE_INSERT)
|| (c->icc_state != ICC_STATE_NOCARD && how == CARD_CHANGE_REMOVE)) || (c->ccid_state != CCID_STATE_NOCARD && how == CARD_CHANGE_REMOVE))
eventflag_signal (&c->ccid_comm, EV_CARD_CHANGE); eventflag_signal (&c->ccid_comm, EV_CARD_CHANGE);
} }
@@ -1361,7 +1361,7 @@ ccid_usb_reset (void)
} }
#define USB_ICC_TIMEOUT (1950*1000) #define USB_CCID_TIMEOUT (1950*1000)
#define GPG_THREAD_TERMINATED 0xffff #define GPG_THREAD_TERMINATED 0xffff
@@ -1403,8 +1403,8 @@ ccid_thread (void *arg)
} }
ccid.ccid_comm.flags = 0; ccid.ccid_comm.flags = 0;
timeout = USB_ICC_TIMEOUT; timeout = USB_CCID_TIMEOUT;
icc_prepare_receive (c); ccid_prepare_receive (c);
while (1) while (1)
{ {
eventmask_t m; eventmask_t m;
@@ -1418,7 +1418,7 @@ ccid_thread (void *arg)
continue; continue;
} }
timeout = USB_ICC_TIMEOUT; timeout = USB_CCID_TIMEOUT;
m = eventflag_get (&c->ccid_comm); m = eventflag_get (&c->ccid_comm);
if (m == EV_USB_RESET) if (m == EV_USB_RESET)
@@ -1436,9 +1436,9 @@ ccid_thread (void *arg)
uint8_t int_msg[2]; uint8_t int_msg[2];
int_msg[0] = NOTIFY_SLOT_CHANGE; int_msg[0] = NOTIFY_SLOT_CHANGE;
if (c->icc_state == ICC_STATE_NOCARD) if (c->ccid_state == CCID_STATE_NOCARD)
{ /* Inserted! */ { /* Inserted! */
c->icc_state = ICC_STATE_START; c->ccid_state = CCID_STATE_START;
int_msg[1] = 0x03; int_msg[1] = 0x03;
} }
else else
@@ -1450,7 +1450,7 @@ ccid_thread (void *arg)
c->application = 0; c->application = 0;
} }
c->icc_state = ICC_STATE_NOCARD; c->ccid_state = CCID_STATE_NOCARD;
int_msg[1] = 0x02; int_msg[1] = 0x02;
} }
@@ -1458,17 +1458,17 @@ ccid_thread (void *arg)
led_blink (LED_TWOSHOTS); led_blink (LED_TWOSHOTS);
} }
else if (m == EV_RX_DATA_READY) else if (m == EV_RX_DATA_READY)
c->icc_state = icc_handle_data (c); c->ccid_state = ccid_handle_data (c);
else if (m == EV_EXEC_FINISHED) else if (m == EV_EXEC_FINISHED)
if (c->icc_state == ICC_STATE_EXECUTE) if (c->ccid_state == CCID_STATE_EXECUTE)
{ {
if (c->a->sw == GPG_THREAD_TERMINATED) if (c->a->sw == GPG_THREAD_TERMINATED)
{ {
c->sw1sw2[0] = 0x90; c->sw1sw2[0] = 0x90;
c->sw1sw2[1] = 0x00; c->sw1sw2[1] = 0x00;
c->state = APDU_STATE_RESULT; c->state = APDU_STATE_RESULT;
icc_send_data_block (c); ccid_send_data_block (c);
c->icc_state = ICC_STATE_EXITED; c->ccid_state = CCID_STATE_EXITED;
break; break;
} }
@@ -1479,16 +1479,16 @@ ccid_thread (void *arg)
if (c->a->res_apdu_data_len <= c->a->expected_res_size) if (c->a->res_apdu_data_len <= c->a->expected_res_size)
{ {
c->state = APDU_STATE_RESULT; c->state = APDU_STATE_RESULT;
icc_send_data_block (c); ccid_send_data_block (c);
c->icc_state = ICC_STATE_WAIT; c->ccid_state = CCID_STATE_WAIT;
} }
else else
{ {
c->state = APDU_STATE_RESULT_GET_RESPONSE; c->state = APDU_STATE_RESULT_GET_RESPONSE;
c->p = c->a->res_apdu_data; c->p = c->a->res_apdu_data;
c->len = c->a->res_apdu_data_len; c->len = c->a->res_apdu_data_len;
icc_send_data_block_gr (c, c->a->expected_res_size); ccid_send_data_block_gr (c, c->a->expected_res_size);
c->icc_state = ICC_STATE_WAIT; c->ccid_state = CCID_STATE_WAIT;
} }
} }
else else
@@ -1510,10 +1510,10 @@ ccid_thread (void *arg)
if (c->state == APDU_STATE_WAIT_COMMAND if (c->state == APDU_STATE_WAIT_COMMAND
|| c->state == APDU_STATE_COMMAND_CHAINING || c->state == APDU_STATE_COMMAND_CHAINING
|| c->state == APDU_STATE_RESULT_GET_RESPONSE) || c->state == APDU_STATE_RESULT_GET_RESPONSE)
icc_prepare_receive (c); ccid_prepare_receive (c);
} }
else /* Timeout */ else /* Timeout */
c->icc_state = icc_handle_timeout (c); c->ccid_state = ccid_handle_timeout (c);
} }
if (c->application) if (c->application)

12
src/usb_conf.h
View File

@@ -3,8 +3,8 @@
#ifndef __USB_CONF_H #ifndef __USB_CONF_H
#define __USB_CONF_H #define __USB_CONF_H
#define ICC_NUM_INTERFACES 1 #define CCID_NUM_INTERFACES 1
#define ICC_INTERFACE 0 #define CCID_INTERFACE 0
#ifdef HID_CARD_CHANGE_SUPPORT #ifdef HID_CARD_CHANGE_SUPPORT
#define HID_NUM_INTERFACES 1 #define HID_NUM_INTERFACES 1
#define HID_INTERFACE 1 #define HID_INTERFACE 1
@@ -13,18 +13,18 @@
#endif #endif
#ifdef ENABLE_VIRTUAL_COM_PORT #ifdef ENABLE_VIRTUAL_COM_PORT
#define VCOM_NUM_INTERFACES 2 #define VCOM_NUM_INTERFACES 2
#define VCOM_INTERFACE_0 (ICC_NUM_INTERFACES + HID_NUM_INTERFACES) #define VCOM_INTERFACE_0 (CCID_NUM_INTERFACES + HID_NUM_INTERFACES)
#define VCOM_INTERFACE_1 (ICC_NUM_INTERFACES + HID_NUM_INTERFACES + 1) #define VCOM_INTERFACE_1 (CCID_NUM_INTERFACES + HID_NUM_INTERFACES + 1)
#else #else
#define VCOM_NUM_INTERFACES 0 #define VCOM_NUM_INTERFACES 0
#endif #endif
#ifdef PINPAD_DND_SUPPORT #ifdef PINPAD_DND_SUPPORT
#define MSC_NUM_INTERFACES 1 #define MSC_NUM_INTERFACES 1
#define MSC_INTERFACE (ICC_NUM_INTERFACES + HID_NUM_INTERFACES + VCOM_NUM_INTERFACES) #define MSC_INTERFACE (CCID_NUM_INTERFACES + HID_NUM_INTERFACES + VCOM_NUM_INTERFACES)
#else #else
#define MSC_NUM_INTERFACES 0 #define MSC_NUM_INTERFACES 0
#endif #endif
#define NUM_INTERFACES (ICC_NUM_INTERFACES + HID_NUM_INTERFACES \ #define NUM_INTERFACES (CCID_NUM_INTERFACES + HID_NUM_INTERFACES \
+ VCOM_NUM_INTERFACES + MSC_NUM_INTERFACES) + VCOM_NUM_INTERFACES + MSC_NUM_INTERFACES)
#if defined(USB_SELF_POWERED) #if defined(USB_SELF_POWERED)

10
src/usb_ctrl.c
View File

@@ -132,7 +132,7 @@ static uint16_t hid_report;
static void static void
gnuk_setup_endpoints_for_interface (uint16_t interface, int stop) gnuk_setup_endpoints_for_interface (uint16_t interface, int stop)
{ {
if (interface == ICC_INTERFACE) if (interface == CCID_INTERFACE)
{ {
if (!stop) if (!stop)
{ {
@@ -276,7 +276,7 @@ usb_cb_setup (uint8_t req, uint8_t req_no, struct req_args *arg)
if (req_no == USB_FSIJ_GNUK_DOWNLOAD) if (req_no == USB_FSIJ_GNUK_DOWNLOAD)
{ {
if (*icc_state_p != ICC_STATE_EXITED) if (*ccid_state_p != CCID_STATE_EXITED)
return USB_UNSUPPORT; return USB_UNSUPPORT;
if (addr < &_regnual_start || addr + arg->len > __heap_end__) if (addr < &_regnual_start || addr + arg->len > __heap_end__)
@@ -291,7 +291,7 @@ usb_cb_setup (uint8_t req, uint8_t req_no, struct req_args *arg)
} }
else if (req_no == USB_FSIJ_GNUK_EXEC && arg->len == 0) else if (req_no == USB_FSIJ_GNUK_EXEC && arg->len == 0)
{ {
if (*icc_state_p != ICC_STATE_EXITED) if (*ccid_state_p != CCID_STATE_EXITED)
return USB_UNSUPPORT; return USB_UNSUPPORT;
if (((uint32_t)addr & 0x03)) if (((uint32_t)addr & 0x03))
@@ -311,7 +311,7 @@ usb_cb_setup (uint8_t req, uint8_t req_no, struct req_args *arg)
} }
else if (type_rcp == (CLASS_REQUEST | INTERFACE_RECIPIENT)) else if (type_rcp == (CLASS_REQUEST | INTERFACE_RECIPIENT))
{ {
if (arg->index == ICC_INTERFACE) if (arg->index == CCID_INTERFACE)
{ {
if (USB_SETUP_GET (req)) if (USB_SETUP_GET (req))
{ {
@@ -396,7 +396,7 @@ usb_cb_ctrl_write_finish (uint8_t req, uint8_t req_no, struct req_args *arg)
{ {
if (USB_SETUP_SET (req) && req_no == USB_FSIJ_GNUK_EXEC) if (USB_SETUP_SET (req) && req_no == USB_FSIJ_GNUK_EXEC)
{ {
if (*icc_state_p != ICC_STATE_EXITED) if (*ccid_state_p != CCID_STATE_EXITED)
return; return;
bDeviceState = UNCONNECTED; bDeviceState = UNCONNECTED;

26
src/usb_desc.c
View File

@@ -53,10 +53,10 @@ static const uint8_t hid_report_desc[] = {
}; };
#endif #endif
#define USB_ICC_INTERFACE_CLASS 0x0B #define USB_CCID_INTERFACE_CLASS 0x0B
#define USB_ICC_INTERFACE_SUBCLASS 0x00 #define USB_CCID_INTERFACE_SUBCLASS 0x00
#define USB_ICC_INTERFACE_BULK_PROTOCOL 0x00 #define USB_CCID_INTERFACE_BULK_PROTOCOL 0x00
#define USB_ICC_DATA_SIZE 64 #define USB_CCID_DATA_SIZE 64
/* USB Standard Device Descriptor */ /* USB Standard Device Descriptor */
static const uint8_t device_desc[] = { static const uint8_t device_desc[] = {
@@ -74,7 +74,7 @@ static const uint8_t device_desc[] = {
0x01 /* bNumConfigurations */ 0x01 /* bNumConfigurations */
}; };
#define ICC_TOTAL_LENGTH (9+9+54+7+7+7) #define CCID_TOTAL_LENGTH (9+9+54+7+7+7)
#ifdef HID_CARD_CHANGE_SUPPORT #ifdef HID_CARD_CHANGE_SUPPORT
#define HID_TOTAL_LENGTH (9+9+7) #define HID_TOTAL_LENGTH (9+9+7)
@@ -94,7 +94,7 @@ static const uint8_t device_desc[] = {
#define MSC_TOTAL_LENGTH 0 #define MSC_TOTAL_LENGTH 0
#endif #endif
#define W_TOTAL_LENGTH (ICC_TOTAL_LENGTH + HID_TOTAL_LENGTH \ #define W_TOTAL_LENGTH (CCID_TOTAL_LENGTH + HID_TOTAL_LENGTH \
+ VCOM_TOTAL_LENGTH + MSC_TOTAL_LENGTH) + VCOM_TOTAL_LENGTH + MSC_TOTAL_LENGTH)
@@ -112,12 +112,12 @@ static const uint8_t config_desc[] = {
/* Interface Descriptor */ /* Interface Descriptor */
9, /* bLength: Interface Descriptor size */ 9, /* bLength: Interface Descriptor size */
INTERFACE_DESCRIPTOR, /* bDescriptorType: Interface */ INTERFACE_DESCRIPTOR, /* bDescriptorType: Interface */
ICC_INTERFACE, /* bInterfaceNumber: Index of this interface */ CCID_INTERFACE, /* bInterfaceNumber: Index of this interface */
0, /* Alternate setting for this interface */ 0, /* Alternate setting for this interface */
3, /* bNumEndpoints: Bulk-IN, Bulk-OUT, Intr-IN */ 3, /* bNumEndpoints: Bulk-IN, Bulk-OUT, Intr-IN */
USB_ICC_INTERFACE_CLASS, USB_CCID_INTERFACE_CLASS,
USB_ICC_INTERFACE_SUBCLASS, USB_CCID_INTERFACE_SUBCLASS,
USB_ICC_INTERFACE_BULK_PROTOCOL, USB_CCID_INTERFACE_BULK_PROTOCOL,
0, /* string index for interface */ 0, /* string index for interface */
/* ICC Descriptor */ /* ICC Descriptor */
@@ -170,14 +170,14 @@ static const uint8_t config_desc[] = {
ENDPOINT_DESCRIPTOR, /* bDescriptorType: Endpoint */ ENDPOINT_DESCRIPTOR, /* bDescriptorType: Endpoint */
0x81, /* bEndpointAddress: (IN1) */ 0x81, /* bEndpointAddress: (IN1) */
0x02, /* bmAttributes: Bulk */ 0x02, /* bmAttributes: Bulk */
USB_ICC_DATA_SIZE, 0x00, /* wMaxPacketSize: */ USB_CCID_DATA_SIZE, 0x00, /* wMaxPacketSize: */
0x00, /* bInterval */ 0x00, /* bInterval */
/*Endpoint OUT1 Descriptor*/ /*Endpoint OUT1 Descriptor*/
7, /* bLength: Endpoint Descriptor size */ 7, /* bLength: Endpoint Descriptor size */
ENDPOINT_DESCRIPTOR, /* bDescriptorType: Endpoint */ ENDPOINT_DESCRIPTOR, /* bDescriptorType: Endpoint */
0x01, /* bEndpointAddress: (OUT1) */ 0x01, /* bEndpointAddress: (OUT1) */
0x02, /* bmAttributes: Bulk */ 0x02, /* bmAttributes: Bulk */
USB_ICC_DATA_SIZE, 0x00, /* wMaxPacketSize: */ USB_CCID_DATA_SIZE, 0x00, /* wMaxPacketSize: */
0x00, /* bInterval */ 0x00, /* bInterval */
/*Endpoint IN2 Descriptor*/ /*Endpoint IN2 Descriptor*/
7, /* bLength: Endpoint Descriptor size */ 7, /* bLength: Endpoint Descriptor size */
@@ -388,7 +388,7 @@ usb_cb_get_descriptor (uint8_t rcp, uint8_t desc_type, uint8_t desc_index,
if (arg->index == HID_INTERFACE) if (arg->index == HID_INTERFACE)
{ {
if (desc_type == USB_DT_HID) if (desc_type == USB_DT_HID)
return usb_lld_reply_request (config_desc+ICC_TOTAL_LENGTH+9, 9, return usb_lld_reply_request (config_desc+CCID_TOTAL_LENGTH+9, 9,
arg); arg);
else if (desc_type == USB_DT_REPORT) else if (desc_type == USB_DT_REPORT)
return usb_lld_reply_request (hid_report_desc, HID_REPORT_DESC_SIZE, return usb_lld_reply_request (hid_report_desc, HID_REPORT_DESC_SIZE,