#include "usb_cdc.h" // for usb_poll_validate_length
#include "fpgaloader.h"
-static int timeout = 4096;
+// iCLASS has a slightly different timing compared to ISO15693. According to the picopass data sheet the tag response is expected 330us after
+// the reader command. This is measured from end of reader EOF to first modulation of the tag's SOF which starts with a 56,64us unmodulated period.
+// 330us = 140 ssp_clk cycles @ 423,75kHz when simulating.
+// 56,64us = 24 ssp_clk_cycles
+#define DELAY_ICLASS_VCD_TO_VICC_SIM (140 - 24)
+// times in ssp_clk_cycles @ 3,3625MHz when acting as reader
+#define DELAY_ICLASS_VICC_TO_VCD_READER DELAY_ISO15693_VICC_TO_VCD_READER
+// times in samples @ 212kHz when acting as reader
+#define ICLASS_READER_TIMEOUT_ACTALL 330 // 1558us, nominal 330us + 7slots*160us = 1450us
+#define ICLASS_READER_TIMEOUT_OTHERS 80 // 380us, nominal 330us
+
//-----------------------------------------------------------------------------
// The software UART that receives commands from the reader, and its state
//if (!LogTrace(NULL, 0, Uart.endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER, 0, true)) break;
uint8_t parity[MAX_PARITY_SIZE];
GetParity(Uart.output, Uart.byteCnt, parity);
- LogTrace(Uart.output, Uart.byteCnt, time_start, time_stop, parity, true);
+ LogTrace_ISO15693(Uart.output, Uart.byteCnt, time_start*32, time_stop*32, parity, true);
/* And ready to receive another command. */
Uart.state = STATE_UNSYNCD;
uint8_t parity[MAX_PARITY_SIZE];
GetParity(Demod.output, Demod.len, parity);
- LogTrace(Demod.output, Demod.len, time_start, time_stop, parity, false);
+ LogTrace_ISO15693(Demod.output, Demod.len, time_start*32, time_stop*32, parity, false);
// And ready to receive another response.
memset(&Demod, 0, sizeof(Demod));
// Encode SOF only
static void CodeIClassTagSOF() {
- //So far a dummy implementation, not used
- //int lastProxToAirDuration =0;
-
ToSendReset();
- // Send SOF
ToSend[++ToSendMax] = 0x1D;
-// lastProxToAirDuration = 8*ToSendMax - 3*8;//Not counting zeroes in the beginning
-
- // Convert from last byte pos to length
ToSendMax++;
}
// free eventually allocated BigBuf memory
BigBuf_free_keep_EM();
- State cipher_state;
+ uint16_t page_size = 32 * 8;
+ uint8_t current_page = 0;
+
+ // maintain cipher states for both credit and debit key for each page
+ State cipher_state_KC[8];
+ State cipher_state_KD[8];
+ State *cipher_state = &cipher_state_KD[0];
uint8_t *emulator = BigBuf_get_EM_addr();
uint8_t *csn = emulator;
- uint8_t sof_data[] = { 0x0F } ;
// CSN followed by two CRC bytes
- uint8_t anticoll_data[10] = { 0 };
- uint8_t csn_data[10] = { 0 };
+ uint8_t anticoll_data[10];
+ uint8_t csn_data[10];
memcpy(csn_data, csn, sizeof(csn_data));
Dbprintf("Simulating CSN %02x%02x%02x%02x%02x%02x%02x%02x", csn[0], csn[1], csn[2], csn[3], csn[4], csn[5], csn[6], csn[7]);
AppendCrc(anticoll_data, 8);
AppendCrc(csn_data, 8);
- uint8_t diversified_key[8] = { 0 };
+ uint8_t diversified_key_d[8] = { 0x00 };
+ uint8_t diversified_key_c[8] = { 0x00 };
+ uint8_t *diversified_key = diversified_key_d;
+
+ // configuration block
+ uint8_t conf_block[10] = {0x12, 0xFF, 0xFF, 0xFF, 0x7F, 0x1F, 0xFF, 0x3C, 0x00, 0x00};
+
// e-Purse
uint8_t card_challenge_data[8] = { 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
- //uint8_t card_challenge_data[8] = { 0 };
+
if (simulationMode == ICLASS_SIM_MODE_FULL) {
- // The diversified key should be stored on block 3
- // Get the diversified key from emulator memory
- memcpy(diversified_key, emulator + (8 * 3), 8);
- // Card challenge, a.k.a e-purse is on block 2
- memcpy(card_challenge_data, emulator + (8 * 2), 8);
- // Precalculate the cipher state, feeding it the CC
- cipher_state = opt_doTagMAC_1(card_challenge_data, diversified_key);
+ // initialize from page 0
+ memcpy(conf_block, emulator + 8 * 1, 8);
+ memcpy(card_challenge_data, emulator + 8 * 2, 8); // e-purse
+ memcpy(diversified_key_d, emulator + 8 * 3, 8); // Kd
+ memcpy(diversified_key_c, emulator + 8 * 4, 8); // Kc
}
+
+ AppendCrc(conf_block, 8);
+
// save card challenge for sim2,4 attack
if (reader_mac_buf != NULL) {
memcpy(reader_mac_buf, card_challenge_data, 8);
}
+ if (conf_block[5] & 0x80) {
+ page_size = 256 * 8;
+ }
+
+ // From PicoPass DS:
+ // When the page is in personalization mode this bit is equal to 1.
+ // Once the application issuer has personalized and coded its dedicated areas, this bit must be set to 0:
+ // the page is then "in application mode".
+ bool personalization_mode = conf_block[7] & 0x80;
+
+ // chip memory may be divided in 8 pages
+ uint8_t max_page = conf_block[4] & 0x10 ? 0 : 7;
+
+ // Precalculate the cipher states, feeding it the CC
+ cipher_state_KD[0] = opt_doTagMAC_1(card_challenge_data, diversified_key_d);
+ cipher_state_KC[0] = opt_doTagMAC_1(card_challenge_data, diversified_key_c);
+ if (simulationMode == ICLASS_SIM_MODE_FULL) {
+ for (int i = 1; i < max_page; i++) {
+ uint8_t *epurse = emulator + i*page_size + 8*2;
+ uint8_t *Kd = emulator + i*page_size + 8*3;
+ uint8_t *Kc = emulator + i*page_size + 8*4;
+ cipher_state_KD[i] = opt_doTagMAC_1(epurse, Kd);
+ cipher_state_KC[i] = opt_doTagMAC_1(epurse, Kc);
+ }
+ }
+
int exitLoop = 0;
// Reader 0a
// Tag 0f
int trace_data_size = 0;
// Respond SOF -- takes 1 bytes
- uint8_t *resp_sof = BigBuf_malloc(2);
+ uint8_t *resp_sof = BigBuf_malloc(1);
int resp_sof_Len;
// Anticollision CSN (rotated CSN)
// configuration (block 1) picopass 2ks
uint8_t *resp_conf = BigBuf_malloc(22);
int resp_conf_len;
- uint8_t conf_data[10] = {0x12, 0xFF, 0xFF, 0xFF, 0x7F, 0x1F, 0xFF, 0x3C, 0x00, 0x00};
- AppendCrc(conf_data, 8);
// e-Purse (block 2)
// 18: Takes 2 bytes for SOF/EOF and 8 * 2 = 16 bytes (2 bytes/bit)
int len;
// Prepare card messages
- ToSendMax = 0;
// First card answer: SOF only
CodeIClassTagSOF();
resp_csn_len = ToSendMax;
// Configuration (block 1)
- CodeIso15693AsTag(conf_data, sizeof(conf_data));
+ CodeIso15693AsTag(conf_block, sizeof(conf_block));
memcpy(resp_conf, ToSend, ToSendMax);
resp_conf_len = ToSendMax;
uint8_t *data_generic_trace = BigBuf_malloc(32 + 2); // 32 bytes data + 2byte CRC is max tag answer
uint8_t *data_response = BigBuf_malloc( (32 + 2) * 2 + 2);
- LED_A_ON();
bool buttonPressed = false;
enum { IDLE, ACTIVATED, SELECTED, HALTED } chip_state = IDLE;
while (!exitLoop) {
WDT_HIT();
- LED_B_OFF();
- //Signal tracer
- // Can be used to get a trigger for an oscilloscope..
- LED_C_OFF();
uint32_t reader_eof_time = 0;
len = GetIso15693CommandFromReader(receivedCmd, MAX_FRAME_SIZE, &reader_eof_time);
break;
}
- //Signal tracer
- LED_C_ON();
-
// Now look at the reader command and provide appropriate responses
// default is no response:
modulated_response = NULL;
if (chip_state != HALTED) {
modulated_response = resp_sof;
modulated_response_size = resp_sof_Len;
- trace_data = sof_data;
- trace_data_size = sizeof(sof_data);
chip_state = ACTIVATED;
}
case 1: // configuration (block 01)
modulated_response = resp_conf;
modulated_response_size = resp_conf_len;
- trace_data = conf_data;
- trace_data_size = sizeof(conf_data);
+ trace_data = conf_block;
+ trace_data_size = sizeof(conf_block);
break;
case 2: // e-purse (block 02)
modulated_response = resp_cc;
trace_data = ff_data;
trace_data_size = sizeof(ff_data);
} else { // use data from emulator memory
- memcpy(data_generic_trace, emulator + 8*blockNo, 8);
+ memcpy(data_generic_trace, emulator + current_page*page_size + 8*blockNo, 8);
AppendCrc(data_generic_trace, 8);
trace_data = data_generic_trace;
trace_data_size = 10;
}
} else if ((receivedCmd[0] == ICLASS_CMD_READCHECK_KD
- || receivedCmd[0] == ICLASS_CMD_READCHECK_KC) && len == 2) {
+ || receivedCmd[0] == ICLASS_CMD_READCHECK_KC) && receivedCmd[1] == 0x02 && len == 2) {
// Read e-purse (88 02 || 18 02)
if (chip_state == SELECTED) {
+ if(receivedCmd[0] == ICLASS_CMD_READCHECK_KD){
+ cipher_state = &cipher_state_KD[current_page];
+ diversified_key = diversified_key_d;
+ } else {
+ cipher_state = &cipher_state_KC[current_page];
+ diversified_key = diversified_key_c;
+ }
modulated_response = resp_cc;
modulated_response_size = resp_cc_len;
trace_data = card_challenge_data;
trace_data_size = sizeof(card_challenge_data);
- LED_B_ON();
}
- } else if (receivedCmd[0] == ICLASS_CMD_CHECK && len == 9) {
+ } else if ((receivedCmd[0] == ICLASS_CMD_CHECK_KC
+ || receivedCmd[0] == ICLASS_CMD_CHECK_KD) && len == 9) {
// Reader random and reader MAC!!!
if (chip_state == SELECTED) {
if (simulationMode == ICLASS_SIM_MODE_FULL) {
//NR, from reader, is in receivedCmd+1
- opt_doTagMAC_2(cipher_state, receivedCmd+1, data_generic_trace, diversified_key);
+ opt_doTagMAC_2(*cipher_state, receivedCmd+1, data_generic_trace, diversified_key);
trace_data = data_generic_trace;
trace_data_size = 4;
CodeIso15693AsTag(trace_data, trace_data_size);
} else if (receivedCmd[0] == ICLASS_CMD_HALT && len == 1) {
if (chip_state == SELECTED) {
// Reader ends the session
+ modulated_response = resp_sof;
+ modulated_response_size = resp_sof_Len;
chip_state = HALTED;
}
} else if (simulationMode == ICLASS_SIM_MODE_FULL && receivedCmd[0] == ICLASS_CMD_READ4 && len == 4) { // 0x06
//Read 4 blocks
if (chip_state == SELECTED) {
- memcpy(data_generic_trace, emulator + (receivedCmd[1] << 3), 8 * 4);
+ uint8_t blockNo = receivedCmd[1];
+ memcpy(data_generic_trace, emulator + current_page*page_size + blockNo*8, 8 * 4);
AppendCrc(data_generic_trace, 8 * 4);
trace_data = data_generic_trace;
trace_data_size = 8 * 4 + 2;
}
} else if (receivedCmd[0] == ICLASS_CMD_UPDATE && (len == 12 || len == 14)) {
- // Probably the reader wants to update the nonce. Let's just ignore that for now.
- // OBS! If this is implemented, don't forget to regenerate the cipher_state
// We're expected to respond with the data+crc, exactly what's already in the receivedCmd
// receivedCmd is now UPDATE 1b | ADDRESS 1b | DATA 8b | Signature 4b or CRC 2b
if (chip_state == SELECTED) {
+ uint8_t blockNo = receivedCmd[1];
+ if (blockNo == 2) { // update e-purse
+ memcpy(card_challenge_data, receivedCmd+2, 8);
+ CodeIso15693AsTag(card_challenge_data, sizeof(card_challenge_data));
+ memcpy(resp_cc, ToSend, ToSendMax);
+ resp_cc_len = ToSendMax;
+ cipher_state_KD[current_page] = opt_doTagMAC_1(card_challenge_data, diversified_key_d);
+ cipher_state_KC[current_page] = opt_doTagMAC_1(card_challenge_data, diversified_key_c);
+ if (simulationMode == ICLASS_SIM_MODE_FULL) {
+ memcpy(emulator + current_page*page_size + 8*2, card_challenge_data, 8);
+ }
+ } else if (blockNo == 3) { // update Kd
+ for (int i = 0; i < 8; i++) {
+ if (personalization_mode) {
+ diversified_key_d[i] = receivedCmd[2 + i];
+ } else {
+ diversified_key_d[i] ^= receivedCmd[2 + i];
+ }
+ }
+ cipher_state_KD[current_page] = opt_doTagMAC_1(card_challenge_data, diversified_key_d);
+ if (simulationMode == ICLASS_SIM_MODE_FULL) {
+ memcpy(emulator + current_page*page_size + 8*3, diversified_key_d, 8);
+ }
+ } else if (blockNo == 4) { // update Kc
+ for (int i = 0; i < 8; i++) {
+ if (personalization_mode) {
+ diversified_key_c[i] = receivedCmd[2 + i];
+ } else {
+ diversified_key_c[i] ^= receivedCmd[2 + i];
+ }
+ }
+ cipher_state_KC[current_page] = opt_doTagMAC_1(card_challenge_data, diversified_key_c);
+ if (simulationMode == ICLASS_SIM_MODE_FULL) {
+ memcpy(emulator + current_page*page_size + 8*4, diversified_key_c, 8);
+ }
+ } else if (simulationMode == ICLASS_SIM_MODE_FULL) { // update any other data block
+ memcpy(emulator + current_page*page_size + 8*blockNo, receivedCmd+2, 8);
+ }
memcpy(data_generic_trace, receivedCmd + 2, 8);
AppendCrc(data_generic_trace, 8);
trace_data = data_generic_trace;
} else if (receivedCmd[0] == ICLASS_CMD_PAGESEL && len == 4) {
// Pagesel
+ // Chips with a single page will not answer to this command
+ // Otherwise, we should answer 8bytes (conf block 1) + 2bytes CRC
if (chip_state == SELECTED) {
- // Pagesel enables to select a page in the selected chip memory and return its configuration block
- // Chips with a single page will not answer to this command
- // It appears we're fine ignoring this.
- // Otherwise, we should answer 8bytes (block) + 2bytes CRC
+ if (simulationMode == ICLASS_SIM_MODE_FULL && max_page > 0) {
+ current_page = receivedCmd[1];
+ memcpy(data_generic_trace, emulator + current_page*page_size + 8*1, 8);
+ memcpy(diversified_key_d, emulator + current_page*page_size + 8*3, 8);
+ memcpy(diversified_key_c, emulator + current_page*page_size + 8*4, 8);
+ cipher_state = &cipher_state_KD[current_page];
+ personalization_mode = data_generic_trace[7] & 0x80;
+ AppendCrc(data_generic_trace, 8);
+ trace_data = data_generic_trace;
+ trace_data_size = 10;
+ CodeIso15693AsTag(trace_data, trace_data_size);
+ memcpy(data_response, ToSend, ToSendMax);
+ modulated_response = data_response;
+ modulated_response_size = ToSendMax;
+ }
}
+ } else if (receivedCmd[0] == 0x26 && len == 5) {
+ // standard ISO15693 INVENTORY command. Ignore.
+
} else {
// don't know how to handle this command
char debug_message[250]; // should be enough
}
/**
- A legit tag has about 311,5us delay between reader EOT and tag SOF.
+ A legit tag has about 273,4us delay between reader EOT and tag SOF.
**/
if (modulated_response_size > 0) {
- uint32_t response_time = reader_eof_time + DELAY_ISO15693_VCD_TO_VICC_SIM - DELAY_ARM_TO_READER_SIM;
- TransmitTo15693Reader(modulated_response, modulated_response_size, response_time, false);
- LogTrace(trace_data, trace_data_size, response_time + DELAY_ARM_TO_READER_SIM, response_time + (modulated_response_size << 6) + DELAY_ARM_TO_READER_SIM, NULL, false);
+ uint32_t response_time = reader_eof_time + DELAY_ICLASS_VCD_TO_VICC_SIM;
+ TransmitTo15693Reader(modulated_response, modulated_response_size, &response_time, 0, false);
+ LogTrace_ISO15693(trace_data, trace_data_size, response_time*32, response_time*32 + modulated_response_size/2, NULL, false);
}
}
- LED_A_OFF();
- LED_B_OFF();
- LED_C_OFF();
-
if (buttonPressed)
{
DbpString("Button pressed");
* @param datain
*/
void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) {
+
+ LED_A_ON();
+
uint32_t simType = arg0;
uint32_t numberOfCSNS = arg1;
FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR | FPGA_HF_SIMULATOR_NO_MODULATION);
+ LED_D_OFF();
FpgaSetupSsc(FPGA_MAJOR_MODE_HF_SIMULATOR);
StartCountSspClk();
// That will speed things up a little, but not required just yet.
Dbprintf("The mode is not implemented, reserved for future use");
}
+
Dbprintf("Done...");
+ LED_A_OFF();
}
/// THE READER CODE
-//-----------------------------------------------------------------------------
-// Transmit the command (to the tag) that was placed in ToSend[].
-//-----------------------------------------------------------------------------
-static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int *wait) {
- int c;
- FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
- AT91C_BASE_SSC->SSC_THR = 0x00;
- FpgaSetupSsc(FPGA_MAJOR_MODE_HF_ISO14443A);
-
- if (wait) {
- if (*wait < 10) *wait = 10;
-
- for (c = 0; c < *wait;) {
- if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
- AT91C_BASE_SSC->SSC_THR = 0x00; // For exact timing!
- c++;
- }
- if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
- volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
- (void)r;
- }
- WDT_HIT();
- }
- }
-
- uint8_t sendbyte;
- bool firstpart = true;
- c = 0;
- for (;;) {
- if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
-
- // DOUBLE THE SAMPLES!
- if (firstpart) {
- sendbyte = (cmd[c] & 0xf0) | (cmd[c] >> 4);
- } else {
- sendbyte = (cmd[c] & 0x0f) | (cmd[c] << 4);
- c++;
- }
- if (sendbyte == 0xff) {
- sendbyte = 0xfe;
- }
- AT91C_BASE_SSC->SSC_THR = sendbyte;
- firstpart = !firstpart;
-
- if (c >= len) {
- break;
- }
- }
- if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
- volatile uint32_t r = AT91C_BASE_SSC->SSC_RHR;
- (void)r;
- }
- WDT_HIT();
- }
- if (samples && wait) *samples = (c + *wait) << 3;
-}
-
+static void ReaderTransmitIClass(uint8_t *frame, int len, uint32_t *start_time) {
-//-----------------------------------------------------------------------------
-// Prepare iClass reader command to send to FPGA
-//-----------------------------------------------------------------------------
-void CodeIClassCommand(const uint8_t *cmd, int len) {
- int i, j, k;
-
- ToSendReset();
-
- // Start of Communication: 1 out of 4
- ToSend[++ToSendMax] = 0xf0;
- ToSend[++ToSendMax] = 0x00;
- ToSend[++ToSendMax] = 0x0f;
- ToSend[++ToSendMax] = 0x00;
-
- // Modulate the bytes
- for (i = 0; i < len; i++) {
- uint8_t b = cmd[i];
- for (j = 0; j < 4; j++) {
- for (k = 0; k < 4; k++) {
- if (k == (b & 3)) {
- ToSend[++ToSendMax] = 0xf0;
- } else {
- ToSend[++ToSendMax] = 0x00;
- }
- }
- b >>= 2;
- }
- }
-
- // End of Communication
- ToSend[++ToSendMax] = 0x00;
- ToSend[++ToSendMax] = 0x00;
- ToSend[++ToSendMax] = 0xf0;
- ToSend[++ToSendMax] = 0x00;
-
- // Convert from last character reference to length
- ToSendMax++;
-}
-
-static void ReaderTransmitIClass(uint8_t *frame, int len) {
- int wait = 0;
- int samples = 0;
-
- // This is tied to other size changes
- CodeIClassCommand(frame, len);
-
- // Select the card
- TransmitIClassCommand(ToSend, ToSendMax, &samples, &wait);
- if (trigger)
- LED_A_ON();
-
- // Store reader command in buffer
- uint8_t par[MAX_PARITY_SIZE];
- GetParity(frame, len, par);
- LogTrace(frame, len, rsamples, rsamples, par, true);
-}
-
-//-----------------------------------------------------------------------------
-// Wait a certain time for tag response
-// If a response is captured return true
-// If it takes too long return false
-//-----------------------------------------------------------------------------
-static int GetIClassAnswer(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed) {
- //uint8_t *buffer
- // buffer needs to be 512 bytes
- int c;
-
- // Set FPGA mode to "reader listen mode", no modulation (listen
- // only, since we are receiving, not transmitting).
- FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_LISTEN);
-
- // Now get the answer from the card
- Demod.output = receivedResponse;
- Demod.len = 0;
- Demod.state = DEMOD_UNSYNCD;
-
- uint8_t b;
- if (elapsed) *elapsed = 0;
-
- bool skip = false;
-
- c = 0;
- for (;;) {
- WDT_HIT();
-
- if (BUTTON_PRESS()) return false;
-
- if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) {
- AT91C_BASE_SSC->SSC_THR = 0x00; // To make use of exact timing of next command from reader!!
- if (elapsed) (*elapsed)++;
- }
- if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
- if (c < timeout) {
- c++;
- } else {
- return false;
- }
- b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
- skip = !skip;
- if (skip) continue;
+ CodeIso15693AsReader(frame, len);
- if (ManchesterDecoding(b & 0x0f)) {
- *samples = c << 3;
- return true;
- }
- }
- }
-}
+ TransmitTo15693Tag(ToSend, ToSendMax, start_time);
-static int ReaderReceiveIClass(uint8_t *receivedAnswer) {
- int samples = 0;
- if (!GetIClassAnswer(receivedAnswer, 160, &samples, 0)) {
- return false;
- }
- rsamples += samples;
- uint8_t parity[MAX_PARITY_SIZE];
- GetParity(receivedAnswer, Demod.len, parity);
- LogTrace(receivedAnswer, Demod.len, rsamples, rsamples, parity, false);
- if (samples == 0) return false;
- return Demod.len;
+ uint32_t end_time = *start_time + 32*(8*ToSendMax-4); // substract the 4 padding bits after EOF
+ LogTrace_ISO15693(frame, len, *start_time*4, end_time*4, NULL, true);
}
-static void setupIclassReader() {
- FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
- // Reset trace buffer
- set_tracing(true);
- clear_trace();
-
- // Setup SSC
- FpgaSetupSsc(FPGA_MAJOR_MODE_HF_ISO14443A);
- // Start from off (no field generated)
- // Signal field is off with the appropriate LED
- LED_D_OFF();
- FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
- SpinDelay(200);
-
- SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
-
- // Now give it time to spin up.
- // Signal field is on with the appropriate LED
- FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD);
- SpinDelay(200);
- LED_A_ON();
-
-}
-static bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* resp, uint8_t expected_size, uint8_t retries) {
+static bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* resp, size_t max_resp_size,
+ uint8_t expected_size, uint8_t retries, uint32_t start_time, uint32_t *eof_time) {
while (retries-- > 0) {
- ReaderTransmitIClass(command, cmdsize);
- if (expected_size == ReaderReceiveIClass(resp)) {
+ ReaderTransmitIClass(command, cmdsize, &start_time);
+ if (expected_size == GetIso15693AnswerFromTag(resp, max_resp_size, ICLASS_READER_TIMEOUT_OTHERS, eof_time)) {
return true;
}
}
* 1 = Got CSN
* 2 = Got CSN and CC
*/
-static uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) {
- static uint8_t act_all[] = { 0x0a };
- //static uint8_t identify[] = { 0x0c };
- static uint8_t identify[] = { 0x0c, 0x00, 0x73, 0x33 };
- static uint8_t select[] = { 0x81, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
- static uint8_t readcheck_cc[]= { 0x88, 0x02 };
+static uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key, uint32_t *eof_time) {
+ 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 };
if (use_credit_key)
readcheck_cc[0] = 0x18;
else
uint8_t resp[ICLASS_BUFFER_SIZE];
uint8_t read_status = 0;
+ uint32_t start_time = GetCountSspClk();
// Send act_all
- ReaderTransmitIClass(act_all, 1);
+ ReaderTransmitIClass(act_all, 1, &start_time);
// Card present?
- if (!ReaderReceiveIClass(resp)) return read_status;//Fail
+ if (GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_ACTALL, eof_time) < 0) return read_status;//Fail
+
//Send Identify
- ReaderTransmitIClass(identify, 1);
+ start_time = *eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
+ ReaderTransmitIClass(identify, 1, &start_time);
+ // FpgaDisableTracing(); // DEBUGGING
//We expect a 10-byte response here, 8 byte anticollision-CSN and 2 byte CRC
- uint8_t len = ReaderReceiveIClass(resp);
+ uint8_t len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time);
if (len != 10) return read_status;//Fail
//Copy the Anti-collision CSN to our select-packet
memcpy(&select[1], resp, 8);
//Select the card
- ReaderTransmitIClass(select, sizeof(select));
+ start_time = *eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
+ ReaderTransmitIClass(select, sizeof(select), &start_time);
//We expect a 10-byte response here, 8 byte CSN and 2 byte CRC
- len = ReaderReceiveIClass(resp);
+ len = GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time);
if (len != 10) return read_status;//Fail
//Success - level 1, we got CSN
read_status = 1;
// Card selected, now read e-purse (cc) (only 8 bytes no CRC)
- ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc));
- if (ReaderReceiveIClass(resp) == 8) {
+ start_time = *eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
+ ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc), &start_time);
+ if (GetIso15693AnswerFromTag(resp, sizeof(resp), ICLASS_READER_TIMEOUT_OTHERS, eof_time) == 8) {
//Save CC (e-purse) in response data
memcpy(card_data+8, resp, 8);
read_status++;
return read_status;
}
-static uint8_t handshakeIclassTag(uint8_t *card_data) {
- return handshakeIclassTag_ext(card_data, false);
+static uint8_t handshakeIclassTag(uint8_t *card_data, uint32_t *eof_time) {
+ return handshakeIclassTag_ext(card_data, false, eof_time);
}
uint8_t flagReadAA = arg0 & FLAG_ICLASS_READER_AA;
set_tracing(true);
- setupIclassReader();
+ clear_trace();
+ Iso15693InitReader();
+ StartCountSspClk();
+ uint32_t start_time = 0;
+ uint32_t eof_time = 0;
+
uint16_t tryCnt = 0;
bool userCancelled = BUTTON_PRESS() || usb_poll_validate_length();
while (!userCancelled) {
}
WDT_HIT();
- read_status = handshakeIclassTag_ext(card_data, use_credit_key);
+ read_status = handshakeIclassTag_ext(card_data, use_credit_key, &eof_time);
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;
+ start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
// 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)) {
+ if (sendCmdGetResponseWithRetries(readConf, sizeof(readConf), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
result_status |= FLAG_ICLASS_READER_CONF;
memcpy(card_data+8, resp, 8);
} else {
Dbprintf("Failed to dump config block");
}
+ start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
}
//Read block 5, AA
if (flagReadAA) {
- if (sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, 10, 10)) {
+ if (sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
result_status |= FLAG_ICLASS_READER_AA;
memcpy(card_data + (8*5), resp, 8);
} else {
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) {
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LED_A_OFF();
LED_B_OFF();
return;
uint8_t resp[ICLASS_BUFFER_SIZE];
- setupIclassReader();
set_tracing(true);
+ clear_trace();
+ Iso15693InitReader();
+ StartCountSspClk();
+ uint32_t start_time = 0;
+ uint32_t eof_time = 0;
+
while (!BUTTON_PRESS()) {
WDT_HIT();
break;
}
- uint8_t read_status = handshakeIclassTag(card_data);
+ uint8_t read_status = handshakeIclassTag(card_data, &eof_time);
+ start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
+
if (read_status < 2) continue;
//for now replay captured auth (as cc not updated)
memcpy(check+5, MAC, 4);
- if (!sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 5)) {
+ if (!sendCmdGetResponseWithRetries(check, sizeof(check), resp, sizeof(resp), 4, 5, start_time, &eof_time)) {
+ start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
Dbprintf("Error: Authentication Fail!");
continue;
}
+ start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
//first get configuration block (block 1)
crc = block_crc_LUT[1];
read[1] = 1;
read[2] = crc >> 8;
read[3] = crc & 0xff;
- if (!sendCmdGetResponseWithRetries(read, sizeof(read),resp, 10, 10)) {
+ if (!sendCmdGetResponseWithRetries(read, sizeof(read), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
+ start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
Dbprintf("Dump config (block 1) failed");
continue;
}
+ start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
mem = resp[5];
memory.k16 = (mem & 0x80);
memory.book = (mem & 0x20);
read[2] = crc >> 8;
read[3] = crc & 0xff;
- if (sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 10)) {
+ if (sendCmdGetResponseWithRetries(read, sizeof(read), resp, sizeof(resp), 10, 10, start_time, &eof_time)) {
+ start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
Dbprintf(" %02x: %02x %02x %02x %02x %02x %02x %02x %02x",
block, resp[0], resp[1], resp[2],
resp[3], resp[4], resp[5],
card_data,
0);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
LED_A_OFF();
}
-void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType) {
- uint8_t readcheck[] = { keyType, blockNo };
- uint8_t resp[] = {0,0,0,0,0,0,0,0};
- size_t isOK = 0;
- isOK = sendCmdGetResponseWithRetries(readcheck, sizeof(readcheck), resp, sizeof(resp), 6);
- cmd_send(CMD_ACK,isOK, 0, 0, 0, 0);
-}
-
void iClass_Authentication(uint8_t *MAC) {
- uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+ uint8_t check[] = { ICLASS_CMD_CHECK_KD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
uint8_t resp[ICLASS_BUFFER_SIZE];
memcpy(check+5, MAC, 4);
bool isOK;
- isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 6);
+ uint32_t eof_time;
+ isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, sizeof(resp), 4, 6, 0, &eof_time);
cmd_send(CMD_ACK,isOK, 0, 0, 0, 0);
}
-bool iClass_ReadBlock(uint8_t blockNo, uint8_t *readdata) {
+static bool iClass_ReadBlock(uint8_t blockNo, uint8_t *readdata) {
uint8_t readcmd[] = {ICLASS_CMD_READ_OR_IDENTIFY, blockNo, 0x00, 0x00}; //0x88, 0x00 // can i use 0C?
char bl = blockNo;
uint16_t rdCrc = iclass_crc16(&bl, 1);
readcmd[2] = rdCrc >> 8;
readcmd[3] = rdCrc & 0xff;
- uint8_t resp[] = {0,0,0,0,0,0,0,0,0,0};
+ uint8_t resp[10];
bool isOK = false;
-
+ uint32_t eof_time;
+
//readcmd[1] = blockNo;
- isOK = sendCmdGetResponseWithRetries(readcmd, sizeof(readcmd), resp, 10, 10);
+ isOK = sendCmdGetResponseWithRetries(readcmd, sizeof(readcmd), resp, sizeof(resp), 10, 10, 0, &eof_time);
memcpy(readdata, resp, sizeof(resp));
return isOK;
bool isOK = false;
isOK = iClass_ReadBlock(blockno, readblockdata);
cmd_send(CMD_ACK, isOK, 0, 0, readblockdata, 8);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
}
void iClass_Dump(uint8_t blockno, uint8_t numblks) {
uint16_t wrCrc = iclass_crc16(wrCmd, 13);
write[14] = wrCrc >> 8;
write[15] = wrCrc & 0xff;
- uint8_t resp[] = {0,0,0,0,0,0,0,0,0,0};
+ uint8_t resp[10];
bool isOK = false;
-
- isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 10);
+ uint32_t eof_time = 0;
+
+ isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 10, 10, 0, &eof_time);
+ uint32_t start_time = eof_time + DELAY_ICLASS_VICC_TO_VCD_READER;
if (isOK) { //if reader responded correctly
//Dbprintf("WriteResp: %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",resp[0],resp[1],resp[2],resp[3],resp[4],resp[5],resp[6],resp[7],resp[8],resp[9]);
if (memcmp(write+2, resp, 8)) { //if response is not equal to write values
if (blockNo != 3 && blockNo != 4) { //if not programming key areas (note key blocks don't get programmed with actual key data it is xor data)
//error try again
- isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 10);
+ isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 10, 10, start_time, &eof_time);
}
}
}
Dbprintf("Write block [%02x] failed", blockNo);
}
cmd_send(CMD_ACK, isOK, 0, 0, 0, 0);
+ FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
}
void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) {
projects / proxmark3-svn / blobdiff