- uint8_t act_all[] = { 0x0a };
- uint8_t identify[] = { 0x0c };
- uint8_t select[] = { 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
- uint8_t readcheck_cc[]= { 0x88, 0x02 };
-
- uint8_t card_data[24]={0};
- uint8_t last_csn[8]={0};
-
- uint8_t* resp = (((uint8_t *)BigBuf) + 3560); // was 3560 - tied to other size changes
-
- int read_status= 0;
- bool abort_after_read = arg0 & FLAG_ICLASS_READER_ONLY_ONCE;
-
- setupIclassReader();
-
- size_t datasize = 0;
- while(!BUTTON_PRESS())
- {
- WDT_HIT();
-
- // Send act_all
- ReaderTransmitIClass(act_all, 1);
- // Card present?
- if(ReaderReceiveIClass(resp)) {
-
- ReaderTransmitIClass(identify, 1);
-
- if(ReaderReceiveIClass(resp) == 10) {
- //Copy the Anti-collision CSN to our select-packet
- memcpy(&select[1],resp,8);
- //Dbprintf("Anti-collision CSN: %02x %02x %02x %02x %02x %02x %02x %02x",resp[0], resp[1], resp[2],
- // resp[3], resp[4], resp[5],
- // resp[6], resp[7]);
- //Select the card
- ReaderTransmitIClass(select, sizeof(select));
-
- if(ReaderReceiveIClass(resp) == 10) {
- //Save CSN in response data
- memcpy(card_data,resp,8);
- datasize += 8;
- //Flag that we got to at least stage 1, read CSN
- read_status = 1;
-
- // Card selected
- //Dbprintf("Readcheck on Sector 2");
- ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc));
- if(ReaderReceiveIClass(resp) == 8) {
- //Save CC (e-purse) in response data
- memcpy(card_data+8,resp,8);
- datasize += 8;
- //Got both
- read_status = 2;
- }
-
- LED_B_ON();
- //Send back to client, but don't bother if we already sent this
- if(memcmp(last_csn, card_data, 8) != 0)
- cmd_send(CMD_ACK,read_status,0,0,card_data,datasize);
-
- //Save that we already sent this....
- if(read_status == 2)
- memcpy(last_csn, card_data, 8);
-
- LED_B_OFF();
-
- if(abort_after_read) break;
- }
- }
- }
-
- if(traceLen > TRACE_SIZE) {
- DbpString("Trace full");
- break;
- }
- }
- LED_A_OFF();
+
+ uint8_t card_data[6 * 8] = {0};
+ memset(card_data, 0xFF, sizeof(card_data));
+ uint8_t last_csn[8] = {0,0,0,0,0,0,0,0};
+ uint8_t resp[ICLASS_BUFFER_SIZE];
+ memset(resp, 0xFF, sizeof(resp));
+ //Read conf block CRC(0x01) => 0xfa 0x22
+ uint8_t readConf[] = { ICLASS_CMD_READ_OR_IDENTIFY, 0x01, 0xfa, 0x22};
+ //Read App Issuer Area block CRC(0x05) => 0xde 0x64
+ uint8_t readAA[] = { ICLASS_CMD_READ_OR_IDENTIFY, 0x05, 0xde, 0x64};
+
+ int read_status= 0;
+ uint8_t result_status = 0;
+ // flag to read until one tag is found successfully
+ bool abort_after_read = arg0 & FLAG_ICLASS_READER_ONLY_ONCE;
+ // flag to only try 5 times to find one tag then return
+ bool try_once = arg0 & FLAG_ICLASS_READER_ONE_TRY;
+ // if neither abort_after_read nor try_once then continue reading until button pressed.
+
+ bool use_credit_key = arg0 & FLAG_ICLASS_READER_CEDITKEY;
+ // test flags for what blocks to be sure to read
+ uint8_t flagReadConfig = arg0 & FLAG_ICLASS_READER_CONF;
+ uint8_t flagReadCC = arg0 & FLAG_ICLASS_READER_CC;
+ uint8_t flagReadAA = arg0 & FLAG_ICLASS_READER_AA;
+
+ set_tracing(true);
+ setupIclassReader();
+
+ uint16_t tryCnt = 0;
+ bool userCancelled = BUTTON_PRESS() || usb_poll_validate_length();
+ while (!userCancelled) {
+ // if only looking for one card try 2 times if we missed it the first time
+ if (try_once && tryCnt > 2) {
+ break;
+ }
+ tryCnt++;
+ if (!get_tracing()) {
+ DbpString("Trace full");
+ break;
+ }
+ WDT_HIT();
+
+ read_status = handshakeIclassTag_ext(card_data, use_credit_key);
+
+ if (read_status == 0) continue;
+ if (read_status == 1) result_status = FLAG_ICLASS_READER_CSN;
+ if (read_status == 2) result_status = FLAG_ICLASS_READER_CSN | FLAG_ICLASS_READER_CC;
+
+ // handshakeIclass returns CSN|CC, but the actual block
+ // layout is CSN|CONFIG|CC, so here we reorder the data,
+ // moving CC forward 8 bytes
+ memcpy(card_data+16, card_data+8, 8);
+ //Read block 1, config
+ if (flagReadConfig) {
+ if (sendCmdGetResponseWithRetries(readConf, sizeof(readConf), resp, 10, 10)) {
+ result_status |= FLAG_ICLASS_READER_CONF;
+ memcpy(card_data+8, resp, 8);
+ } else {
+ Dbprintf("Failed to dump config block");
+ }
+ }
+
+ //Read block 5, AA
+ if (flagReadAA) {
+ if (sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, 10, 10)) {
+ result_status |= FLAG_ICLASS_READER_AA;
+ memcpy(card_data + (8*5), resp, 8);
+ } else {
+ //Dbprintf("Failed to dump AA block");
+ }
+ }
+
+ // 0 : CSN
+ // 1 : Configuration
+ // 2 : e-purse
+ // 3 : kd / debit / aa2 (write-only)
+ // 4 : kc / credit / aa1 (write-only)
+ // 5 : AIA, Application issuer area
+ //Then we can 'ship' back the 6 * 8 bytes of data,
+ // with 0xFF:s in block 3 and 4.
+
+ LED_B_ON();
+ //Send back to client, but don't bother if we already sent this -
+ // only useful if looping in arm (not try_once && not abort_after_read)
+ if (memcmp(last_csn, card_data, 8) != 0) {
+ // If caller requires that we get Conf, CC, AA, continue until we got it
+ if ( (result_status ^ FLAG_ICLASS_READER_CSN ^ flagReadConfig ^ flagReadCC ^ flagReadAA) == 0) {
+ cmd_send(CMD_ACK, result_status, 0, 0, card_data, sizeof(card_data));
+ if (abort_after_read) {
+ LED_A_OFF();
+ LED_B_OFF();
+ return;
+ }
+ //Save that we already sent this....
+ memcpy(last_csn, card_data, 8);
+ }
+
+ }
+ LED_B_OFF();
+ userCancelled = BUTTON_PRESS() || usb_poll_validate_length();
+ }
+ if (userCancelled) {
+ cmd_send(CMD_ACK, 0xFF, 0, 0, card_data, 0);
+ } else {
+ cmd_send(CMD_ACK, 0, 0, 0, card_data, 0);
+ }
+ LED_A_OFF();