diff --git a/armsrc/iclass.c b/armsrc/iclass.c index d1fcd0b3c..8cfc69936 100644 --- a/armsrc/iclass.c +++ b/armsrc/iclass.c @@ -48,7 +48,6 @@ #include "usb_cdc.h" // for usb_poll_validate_length static int timeout = 4096; - static int SendIClassAnswer(uint8_t *resp, int respLen, int delay); //----------------------------------------------------------------------------- @@ -78,95 +77,87 @@ static struct { uint8_t *output; } Uart; -static RAMFUNC int OutOfNDecoding(int bit) -{ +static RAMFUNC int OutOfNDecoding(int bit) { //int error = 0; int bitright; - if(!Uart.bitBuffer) { + if (!Uart.bitBuffer) { Uart.bitBuffer = bit ^ 0xFF0; return false; - } - else { + } else { Uart.bitBuffer <<= 4; Uart.bitBuffer ^= bit; } - /*if(Uart.swapper) { + /*if (Uart.swapper) { Uart.output[Uart.byteCnt] = Uart.bitBuffer & 0xFF; Uart.byteCnt++; Uart.swapper = 0; - if(Uart.byteCnt > 15) return true; + if (Uart.byteCnt > 15) return true; } else { Uart.swapper = 1; }*/ - if(Uart.state != STATE_UNSYNCD) { + if (Uart.state != STATE_UNSYNCD) { Uart.posCnt++; - if((Uart.bitBuffer & Uart.syncBit) ^ Uart.syncBit) { + if ((Uart.bitBuffer & Uart.syncBit) ^ Uart.syncBit) bit = 0x00; - } - else { + else bit = 0x01; - } - if(((Uart.bitBuffer << 1) & Uart.syncBit) ^ Uart.syncBit) { + + if (((Uart.bitBuffer << 1) & Uart.syncBit) ^ Uart.syncBit) bitright = 0x00; - } - else { + else bitright = 0x01; - } - if(bit != bitright) { bit = bitright; } + + if(bit != bitright) + bit = bitright; // So, now we only have to deal with *bit*, lets see... - if(Uart.posCnt == 1) { + if (Uart.posCnt == 1) { // measurement first half bitperiod - if(!bit) { + if (!bit) { // Drop in first half means that we are either seeing // an SOF or an EOF. - if(Uart.nOutOfCnt == 1) { + if (Uart.nOutOfCnt == 1) { // End of Communication Uart.state = STATE_UNSYNCD; Uart.highCnt = 0; - if(Uart.byteCnt == 0) { + if (Uart.byteCnt == 0) { // Its not straightforward to show single EOFs // So just leave it and do not return TRUE Uart.output[0] = 0xf0; Uart.byteCnt++; - } - else { + } else { return true; } - } - else if(Uart.state != STATE_START_OF_COMMUNICATION) { + } else if (Uart.state != STATE_START_OF_COMMUNICATION) { // When not part of SOF or EOF, it is an error Uart.state = STATE_UNSYNCD; Uart.highCnt = 0; //error = 4; } } - } - else { + } else { // measurement second half bitperiod // Count the bitslot we are in... (ISO 15693) Uart.nOutOfCnt++; - if(!bit) { - if(Uart.dropPosition) { - if(Uart.state == STATE_START_OF_COMMUNICATION) { + if (!bit) { + if (Uart.dropPosition) { + if (Uart.state == STATE_START_OF_COMMUNICATION) { //error = 1; - } - else { + } else { //error = 7; } // It is an error if we already have seen a drop in current frame Uart.state = STATE_UNSYNCD; Uart.highCnt = 0; - } - else { + } else { Uart.dropPosition = Uart.nOutOfCnt; } } @@ -174,35 +165,31 @@ static RAMFUNC int OutOfNDecoding(int bit) Uart.posCnt = 0; - if(Uart.nOutOfCnt == Uart.OutOfCnt && Uart.OutOfCnt == 4) { + if (Uart.nOutOfCnt == Uart.OutOfCnt && Uart.OutOfCnt == 4) { Uart.nOutOfCnt = 0; - if(Uart.state == STATE_START_OF_COMMUNICATION) { - if(Uart.dropPosition == 4) { + if (Uart.state == STATE_START_OF_COMMUNICATION) { + if (Uart.dropPosition == 4) { Uart.state = STATE_RECEIVING; Uart.OutOfCnt = 256; - } - else if(Uart.dropPosition == 3) { + } else if (Uart.dropPosition == 3) { Uart.state = STATE_RECEIVING; Uart.OutOfCnt = 4; //Uart.output[Uart.byteCnt] = 0xdd; //Uart.byteCnt++; - } - else { + } else { Uart.state = STATE_UNSYNCD; Uart.highCnt = 0; } Uart.dropPosition = 0; - } - else { + } else { // RECEIVING DATA // 1 out of 4 - if(!Uart.dropPosition) { + if (!Uart.dropPosition) { Uart.state = STATE_UNSYNCD; Uart.highCnt = 0; //error = 9; - } - else { + } else { Uart.shiftReg >>= 2; // Swap bit order @@ -214,7 +201,7 @@ static RAMFUNC int OutOfNDecoding(int bit) Uart.bitCnt += 2; Uart.dropPosition = 0; - if(Uart.bitCnt == 8) { + if (Uart.bitCnt == 8) { Uart.output[Uart.byteCnt] = (Uart.shiftReg & 0xff); Uart.byteCnt++; Uart.bitCnt = 0; @@ -222,16 +209,14 @@ static RAMFUNC int OutOfNDecoding(int bit) } } } - } - else if(Uart.nOutOfCnt == Uart.OutOfCnt) { + } else if (Uart.nOutOfCnt == Uart.OutOfCnt) { // RECEIVING DATA // 1 out of 256 - if(!Uart.dropPosition) { + if (!Uart.dropPosition) { Uart.state = STATE_UNSYNCD; Uart.highCnt = 0; //error = 3; - } - else { + } else { Uart.dropPosition--; Uart.output[Uart.byteCnt] = (Uart.dropPosition & 0xff); Uart.byteCnt++; @@ -242,7 +227,7 @@ static RAMFUNC int OutOfNDecoding(int bit) } } - /*if(error) { + /*if (error) { Uart.output[Uart.byteCnt] = 0xAA; Uart.byteCnt++; Uart.output[Uart.byteCnt] = error & 0xFF; @@ -260,36 +245,33 @@ static RAMFUNC int OutOfNDecoding(int bit) return true; }*/ } - - } - else { + } else { bit = Uart.bitBuffer & 0xf0; bit >>= 4; bit ^= 0x0F; // drops become 1s ;-) - if(bit) { + if (bit) { // should have been high or at least (4 * 128) / fc // according to ISO this should be at least (9 * 128 + 20) / fc - if(Uart.highCnt == 8) { + if (Uart.highCnt == 8) { // we went low, so this could be start of communication // it turns out to be safer to choose a less significant // syncbit... so we check whether the neighbour also represents the drop Uart.posCnt = 1; // apparently we are busy with our first half bit period Uart.syncBit = bit & 8; Uart.samples = 3; - if(!Uart.syncBit) { Uart.syncBit = bit & 4; Uart.samples = 2; } - else if(bit & 4) { Uart.syncBit = bit & 4; Uart.samples = 2; bit <<= 2; } - if(!Uart.syncBit) { Uart.syncBit = bit & 2; Uart.samples = 1; } - else if(bit & 2) { Uart.syncBit = bit & 2; Uart.samples = 1; bit <<= 1; } - if(!Uart.syncBit) { Uart.syncBit = bit & 1; Uart.samples = 0; - if(Uart.syncBit && (Uart.bitBuffer & 8)) { + if (!Uart.syncBit) { Uart.syncBit = bit & 4; Uart.samples = 2; } + else if (bit & 4) { Uart.syncBit = bit & 4; Uart.samples = 2; bit <<= 2; } + if (!Uart.syncBit) { Uart.syncBit = bit & 2; Uart.samples = 1; } + else if (bit & 2) { Uart.syncBit = bit & 2; Uart.samples = 1; bit <<= 1; } + if (!Uart.syncBit) { Uart.syncBit = bit & 1; Uart.samples = 0; + if (Uart.syncBit && (Uart.bitBuffer & 8)) { Uart.syncBit = 8; // the first half bit period is expected in next sample Uart.posCnt = 0; Uart.samples = 3; } - } - else if(bit & 1) { Uart.syncBit = bit & 1; Uart.samples = 0; } + } else if (bit & 1) { Uart.syncBit = bit & 1; Uart.samples = 0; } Uart.syncBit <<= 4; Uart.state = STATE_START_OF_COMMUNICATION; @@ -300,18 +282,14 @@ static RAMFUNC int OutOfNDecoding(int bit) Uart.dropPosition = 0; Uart.shiftReg = 0; //error = 0; - } - else { + } else { Uart.highCnt = 0; } - } - else { - if(Uart.highCnt < 8) { + } else { + if (Uart.highCnt < 8) Uart.highCnt++; - } } } - return false; } @@ -352,8 +330,7 @@ static struct { uint8_t *output; } Demod; -static RAMFUNC int ManchesterDecoding(int v) -{ +static RAMFUNC int ManchesterDecoding(int v) { int bit; int modulation; int error = 0; @@ -363,89 +340,81 @@ static RAMFUNC int ManchesterDecoding(int v) Demod.buffer2 = Demod.buffer3; Demod.buffer3 = v; - if(Demod.buff < 3) { + if (Demod.buff < 3) { Demod.buff++; return false; } - if(Demod.state==DEMOD_UNSYNCD) { + if (Demod.state == DEMOD_UNSYNCD) { Demod.output[Demod.len] = 0xfa; Demod.syncBit = 0; //Demod.samples = 0; Demod.posCount = 1; // This is the first half bit period, so after syncing handle the second part - if(bit & 0x08) { + if (bit & 0x08) Demod.syncBit = 0x08; - } - if(bit & 0x04) { - if(Demod.syncBit) { + if (bit & 0x04) { + if (Demod.syncBit) bit <<= 4; - } + Demod.syncBit = 0x04; } - if(bit & 0x02) { - if(Demod.syncBit) { + if (bit & 0x02) { + if (Demod.syncBit) bit <<= 2; - } + Demod.syncBit = 0x02; } - if(bit & 0x01 && Demod.syncBit) { + if (bit & 0x01 && Demod.syncBit) Demod.syncBit = 0x01; - } - - if(Demod.syncBit) { + + if (Demod.syncBit) { Demod.len = 0; Demod.state = DEMOD_START_OF_COMMUNICATION; Demod.sub = SUB_FIRST_HALF; Demod.bitCount = 0; Demod.shiftReg = 0; Demod.samples = 0; - if(Demod.posCount) { + if (Demod.posCount) { //if(trigger) LED_A_OFF(); // Not useful in this case... - switch(Demod.syncBit) { + switch (Demod.syncBit) { case 0x08: Demod.samples = 3; break; case 0x04: Demod.samples = 2; break; case 0x02: Demod.samples = 1; break; case 0x01: Demod.samples = 0; break; } // SOF must be long burst... otherwise stay unsynced!!! - if(!(Demod.buffer & Demod.syncBit) || !(Demod.buffer2 & Demod.syncBit)) { + if (!(Demod.buffer & Demod.syncBit) || !(Demod.buffer2 & Demod.syncBit)) Demod.state = DEMOD_UNSYNCD; - } - } - else { + + } else { // SOF must be long burst... otherwise stay unsynced!!! - if(!(Demod.buffer2 & Demod.syncBit) || !(Demod.buffer3 & Demod.syncBit)) { + if (!(Demod.buffer2 & Demod.syncBit) || !(Demod.buffer3 & Demod.syncBit)) { Demod.state = DEMOD_UNSYNCD; error = 0x88; return false; - } - + } // TODO: use this error value to print? Ask Holiman. // 2016-01-08 iceman } error = 0; } - } - else { + } else { modulation = bit & Demod.syncBit; modulation |= ((bit << 1) ^ ((Demod.buffer & 0x08) >> 3)) & Demod.syncBit; Demod.samples += 4; - if(Demod.posCount==0) { + if (Demod.posCount == 0) { Demod.posCount = 1; - if(modulation) { + if (modulation) Demod.sub = SUB_FIRST_HALF; - } - else { + else Demod.sub = SUB_NONE; - } - } - else { + } else { Demod.posCount = 0; /*(modulation && (Demod.sub == SUB_FIRST_HALF)) { if(Demod.state!=DEMOD_ERROR_WAIT) { @@ -455,23 +424,20 @@ static RAMFUNC int ManchesterDecoding(int v) } }*/ //else if(modulation) { - if(modulation) { - if(Demod.sub == SUB_FIRST_HALF) { + if (modulation) { + if (Demod.sub == SUB_FIRST_HALF) Demod.sub = SUB_BOTH; - } - else { + else Demod.sub = SUB_SECOND_HALF; - } } - else if(Demod.sub == SUB_NONE) { - if(Demod.state == DEMOD_SOF_COMPLETE) { + else if (Demod.sub == SUB_NONE) { + if (Demod.state == DEMOD_SOF_COMPLETE) { Demod.output[Demod.len] = 0x0f; Demod.len++; Demod.state = DEMOD_UNSYNCD; // error = 0x0f; return true; - } - else { + } else { Demod.state = DEMOD_ERROR_WAIT; error = 0x33; } @@ -482,38 +448,35 @@ static RAMFUNC int ManchesterDecoding(int v) }*/ } - switch(Demod.state) { + switch (Demod.state) { case DEMOD_START_OF_COMMUNICATION: - if(Demod.sub == SUB_BOTH) { + if (Demod.sub == SUB_BOTH) { //Demod.state = DEMOD_MANCHESTER_D; Demod.state = DEMOD_START_OF_COMMUNICATION2; Demod.posCount = 1; Demod.sub = SUB_NONE; - } - else { + } else { Demod.output[Demod.len] = 0xab; Demod.state = DEMOD_ERROR_WAIT; error = 0xd2; } break; case DEMOD_START_OF_COMMUNICATION2: - if(Demod.sub == SUB_SECOND_HALF) { + if (Demod.sub == SUB_SECOND_HALF) { Demod.state = DEMOD_START_OF_COMMUNICATION3; - } - else { + } else { Demod.output[Demod.len] = 0xab; Demod.state = DEMOD_ERROR_WAIT; error = 0xd3; } break; case DEMOD_START_OF_COMMUNICATION3: - if(Demod.sub == SUB_SECOND_HALF) { + if (Demod.sub == SUB_SECOND_HALF) { // Demod.state = DEMOD_MANCHESTER_D; Demod.state = DEMOD_SOF_COMPLETE; //Demod.output[Demod.len] = Demod.syncBit & 0xFF; //Demod.len++; - } - else { + } else { Demod.output[Demod.len] = 0xab; Demod.state = DEMOD_ERROR_WAIT; error = 0xd4; @@ -524,20 +487,17 @@ static RAMFUNC int ManchesterDecoding(int v) case DEMOD_MANCHESTER_E: // OPPOSITE FROM ISO14443 - 11110000 = 0 (1 in 14443) // 00001111 = 1 (0 in 14443) - if(Demod.sub == SUB_SECOND_HALF) { // SUB_FIRST_HALF + if (Demod.sub == SUB_SECOND_HALF) { // SUB_FIRST_HALF Demod.bitCount++; Demod.shiftReg = (Demod.shiftReg >> 1) ^ 0x100; Demod.state = DEMOD_MANCHESTER_D; - } - else if(Demod.sub == SUB_FIRST_HALF) { // SUB_SECOND_HALF + } else if (Demod.sub == SUB_FIRST_HALF) { // SUB_SECOND_HALF Demod.bitCount++; Demod.shiftReg >>= 1; Demod.state = DEMOD_MANCHESTER_E; - } - else if(Demod.sub == SUB_BOTH) { + } else if (Demod.sub == SUB_BOTH) { Demod.state = DEMOD_MANCHESTER_F; - } - else { + } else { Demod.state = DEMOD_ERROR_WAIT; error = 0x55; } @@ -545,8 +505,8 @@ static RAMFUNC int ManchesterDecoding(int v) case DEMOD_MANCHESTER_F: // Tag response does not need to be a complete byte! - if(Demod.len > 0 || Demod.bitCount > 0) { - if(Demod.bitCount > 1) { // was > 0, do not interpret last closing bit, is part of EOF + if (Demod.len > 0 || Demod.bitCount > 0) { + if (Demod.bitCount > 1) { // was > 0, do not interpret last closing bit, is part of EOF Demod.shiftReg >>= (9 - Demod.bitCount); // right align data Demod.output[Demod.len] = Demod.shiftReg & 0xff; Demod.len++; @@ -554,8 +514,7 @@ static RAMFUNC int ManchesterDecoding(int v) Demod.state = DEMOD_UNSYNCD; return true; - } - else { + } else { Demod.output[Demod.len] = 0xad; Demod.state = DEMOD_ERROR_WAIT; error = 0x03; @@ -572,7 +531,7 @@ static RAMFUNC int ManchesterDecoding(int v) break; } - /*if(Demod.bitCount>=9) { + /*if (Demod.bitCount >= 9) { Demod.output[Demod.len] = Demod.shiftReg & 0xff; Demod.len++; @@ -582,7 +541,7 @@ static RAMFUNC int ManchesterDecoding(int v) Demod.bitCount = 0; Demod.shiftReg = 0; }*/ - if(Demod.bitCount>=8) { + if (Demod.bitCount >= 8) { Demod.shiftReg >>= 1; Demod.output[Demod.len] = (Demod.shiftReg & 0xff); Demod.len++; @@ -590,7 +549,7 @@ static RAMFUNC int ManchesterDecoding(int v) Demod.shiftReg = 0; } - if(error) { + if (error) { Demod.output[Demod.len] = 0xBB; Demod.len++; Demod.output[Demod.len] = error & 0xFF; @@ -610,11 +569,8 @@ static RAMFUNC int ManchesterDecoding(int v) Demod.len++; return true; } - } - } // end (state != UNSYNCED) - return false; } @@ -628,8 +584,18 @@ static RAMFUNC int ManchesterDecoding(int v) // triggering so that we start recording at the point that the tag is moved // near the reader. //----------------------------------------------------------------------------- -void RAMFUNC SnoopIClass(void) -{ +void RAMFUNC SnoopIClass(void) { + + FpgaDownloadAndGo(FPGA_BITSTREAM_HF); + + // free all BigBuf memory + BigBuf_free(); + + clear_trace(); + set_tracing(true); + + iso14a_set_trigger(false); + // We won't start recording the frames that we acquire until we trigger; // a good trigger condition to get started is probably when we see a // response from the tag. @@ -640,29 +606,23 @@ void RAMFUNC SnoopIClass(void) // So 32 should be enough! #define ICLASS_BUFFER_SIZE 32 uint8_t readerToTagCmd[ICLASS_BUFFER_SIZE]; + // The response (tag -> reader) that we're receiving. uint8_t tagToReaderResponse[ICLASS_BUFFER_SIZE]; - - FpgaDownloadAndGo(FPGA_BITSTREAM_HF); - - // free all BigBuf memory - BigBuf_free(); + // The DMA buffer, used to stream samples from the FPGA uint8_t *dmaBuf = BigBuf_malloc(DMA_BUFFER_SIZE); - - clear_trace(); - set_tracing(true); - - iso14a_set_trigger(false); + uint8_t *upTo; int lastRxCounter; - uint8_t *upTo; int smpl; int maxBehindBy = 0; // Count of samples received so far, so that we can include timing // information in the trace buffer. int samples = 0; + + // global variable (apps.h) rsamples = 0; // Set up the demodulator for tag -> reader responses. @@ -694,8 +654,7 @@ void RAMFUNC SnoopIClass(void) SetAdcMuxFor(GPIO_MUXSEL_HIPKD); uint32_t time_0 = GetCountSspClk(); - uint32_t time_start = 0; - uint32_t time_stop = 0; + uint32_t time_start = 0, time_stop = 0; int div = 0; //int div2 = 0; @@ -734,24 +693,22 @@ void RAMFUNC SnoopIClass(void) if(smpl & 0xF) decbyte ^= (1 << (3 - div)); - // FOR READER SIDE COMMUMICATION... - decbyter <<= 2; decbyter ^= (smpl & 0x30); - div++; + div++; if (( div + 1) % 2 == 0) { smpl = decbyter; if ( OutOfNDecoding((smpl & 0xF0) >> 4)) { rsamples = samples - Uart.samples; - time_stop = (GetCountSspClk()-time_0) << 4; + time_stop = (GetCountSspClk() - time_0) << 4; LED_C_ON(); //if(!LogTrace(Uart.output,Uart.byteCnt, rsamples, Uart.parityBits,true)) break; //if(!LogTrace(NULL, 0, Uart.endTime*16 - DELAY_READER_AIR2ARM_AS_SNIFFER, 0, true)) break; - if(tracing) { + if (tracing) { uint8_t parity[MAX_PARITY_SIZE]; GetParity(Uart.output, Uart.byteCnt, parity); LogTrace(Uart.output,Uart.byteCnt, time_start, time_stop, parity, true); @@ -765,20 +722,20 @@ void RAMFUNC SnoopIClass(void) LED_B_OFF(); Uart.byteCnt = 0; } else { - time_start = (GetCountSspClk()-time_0) << 4; + time_start = (GetCountSspClk() - time_0) << 4; } decbyter = 0; } - if(div > 3) { + if (div > 3) { smpl = decbyte; - if(ManchesterDecoding(smpl & 0x0F)) { - time_stop = (GetCountSspClk()-time_0) << 4; + if (ManchesterDecoding(smpl & 0x0F)) { + time_stop = (GetCountSspClk() - time_0) << 4; rsamples = samples - Demod.samples; LED_B_ON(); - if(tracing) { + if (tracing) { uint8_t parity[MAX_PARITY_SIZE]; GetParity(Demod.output, Demod.len, parity); LogTrace(Demod.output, Demod.len, time_start, time_stop, parity, false); @@ -827,8 +784,7 @@ void rotateCSN(uint8_t* originalCSN, uint8_t* rotatedCSN) { // Stop when button is pressed // Or return TRUE when command is captured //----------------------------------------------------------------------------- -static int GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen) -{ +static int GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen) { // Set FPGA mode to "simulated ISO 14443 tag", no modulation (listen // only, since we are receiving, not transmitting). // Signal field is off with the appropriate LED @@ -843,15 +799,15 @@ static int GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen) for(;;) { WDT_HIT(); - if(BUTTON_PRESS()) return false; + if (BUTTON_PRESS()) return false; - if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { + if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { AT91C_BASE_SSC->SSC_THR = 0x00; } - if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { + if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR; - if(OutOfNDecoding(b & 0x0f)) { + if (OutOfNDecoding(b & 0x0f)) { *len = Uart.byteCnt; return true; } @@ -859,9 +815,7 @@ static int GetIClassCommandFromReader(uint8_t *received, int *len, int maxLen) } } -static uint8_t encode4Bits(const uint8_t b) -{ - uint8_t c = b & 0xF; +static uint8_t encode4Bits(const uint8_t b) { // OTA, the least significant bits first // The columns are // 1 - Bit value to send @@ -869,8 +823,9 @@ static uint8_t encode4Bits(const uint8_t b) // 3 - Encoded // 4 - Hex values - switch(c){ - // 1 2 3 4 + uint8_t c = b & 0xF; + switch (c) { + // 1 2 3 4 case 15: return 0x55; // 1111 -> 1111 -> 01010101 -> 0x55 case 14: return 0x95; // 1110 -> 0111 -> 10010101 -> 0x95 case 13: return 0x65; // 1101 -> 1011 -> 01100101 -> 0x65 @@ -887,16 +842,13 @@ static uint8_t encode4Bits(const uint8_t b) case 2: return 0x9a; // 0010 -> 0100 -> 10011010 -> 0x9a case 1: return 0x6a; // 0001 -> 1000 -> 01101010 -> 0x6a default: return 0xaa; // 0000 -> 0000 -> 10101010 -> 0xaa - } } //----------------------------------------------------------------------------- // Prepare tag messages //----------------------------------------------------------------------------- -static void CodeIClassTagAnswer(const uint8_t *cmd, int len) -{ - +static void CodeIClassTagAnswer(const uint8_t *cmd, int len) { /* * SOF comprises 3 parts; * * An unmodulated time of 56.64 us @@ -929,37 +881,34 @@ static void CodeIClassTagAnswer(const uint8_t *cmd, int len) * A logic 0 is 10 * * */ - - int i; - ToSendReset(); // Send SOF - ToSend[++ToSendMax] = 0x1D; - + ToSend[ToSendMax++] = 0x1D; + + int i; for(i = 0; i < len; i++) { uint8_t b = cmd[i]; - ToSend[++ToSendMax] = encode4Bits(b & 0xF); //Least significant half - ToSend[++ToSendMax] = encode4Bits((b >>4) & 0xF);//Most significant half - } + ToSend[ToSendMax++] = encode4Bits(b & 0xF); //Least significant half + ToSend[ToSendMax++] = encode4Bits((b >> 4) & 0xF);//Most significant half + } // Send EOF - ToSend[++ToSendMax] = 0xB8; + ToSend[ToSendMax++] = 0xB8; //lastProxToAirDuration = 8*ToSendMax - 3*8 - 3*8;//Not counting zeroes in the beginning or end // Convert from last byte pos to length ToSendMax++; } // Only SOF -static void CodeIClassTagSOF() -{ +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 + // lastProxToAirDuration = 8*ToSendMax - 3*8;//Not counting zeroes in the beginning // Convert from last byte pos to length ToSendMax++; @@ -981,10 +930,11 @@ int doIClassSimulation(int simulationMode, uint8_t *reader_mac_buf); * @param arg2 * @param datain */ -void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) -{ +void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain) { uint32_t simType = arg0; uint32_t numberOfCSNS = arg1; + + // this will clear out bigbuf memory ... FpgaDownloadAndGo(FPGA_BITSTREAM_HF); // Enable and clear the trace @@ -1004,7 +954,7 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain // Use the CSN from commandline memcpy(emulator, csn_crc, 8); doIClassSimulation(MODE_SIM_CSN,NULL); - } else if(simType == 2) { + } else if (simType == 2) { uint8_t mac_responses[USB_CMD_DATA_SIZE] = { 0 }; Dbprintf("Going into attack mode, %d CSNS sent", numberOfCSNS); @@ -1012,16 +962,16 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain // in order to collect MAC's from the reader. This can later be used in an offlne-attack // in order to obtain the keys, as in the "dismantling iclass"-paper. int i = 0; - for( ; i < numberOfCSNS && i*8+8 < USB_CMD_DATA_SIZE; i++) { + for (; i < numberOfCSNS && i*8 + 8 < USB_CMD_DATA_SIZE; i++) { // The usb data is 512 bytes, fitting 65 8-byte CSNs in there. - memcpy(emulator, datain+(i*8), 8); - if (doIClassSimulation(MODE_EXIT_AFTER_MAC,mac_responses+i*8)) { - cmd_send(CMD_ACK,CMD_SIMULATE_TAG_ICLASS,i,0,mac_responses,i*8); + memcpy(emulator, datain + (i*8), 8); + if (doIClassSimulation(MODE_EXIT_AFTER_MAC, mac_responses+i*8)) { + cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i, 0, mac_responses, i*8); return; // Button pressed } } - cmd_send(CMD_ACK,CMD_SIMULATE_TAG_ICLASS,i,0,mac_responses,i*8); + cmd_send(CMD_ACK, CMD_SIMULATE_TAG_ICLASS, i, 0, mac_responses, i*8); } else if (simType == 3){ //This is 'full sim' mode, where we use the emulator storage for data. @@ -1035,9 +985,8 @@ void SimulateIClass(uint32_t arg0, uint32_t arg1, uint32_t arg2, uint8_t *datain set_tracing(false); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); } -void AppendCrc(uint8_t* data, int len) -{ - ComputeCrc14443(CRC_ICLASS,data,len,data+len,data+len+1); +void AppendCrc(uint8_t* data, int len) { + ComputeCrc14443(CRC_ICLASS, data, len, data+len, data+len+1); } /** @@ -1045,21 +994,22 @@ void AppendCrc(uint8_t* data, int len) * @param csn - csn to use * @param breakAfterMacReceived if true, returns after reader MAC has been received. */ -int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) -{ +int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) { + // free eventually allocated BigBuf memory BigBuf_free_keep_EM(); - + State cipher_state; // State cipher_state_reserve; uint8_t *csn = BigBuf_get_EM_addr(); uint8_t *emulator = csn; uint8_t sof_data[] = { 0x0F} ; + // CSN followed by two CRC bytes uint8_t anticoll_data[10] = { 0 }; uint8_t csn_data[10] = { 0 }; - 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]); + 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]); // Construct anticollision-CSN rotateCSN(csn_data,anticoll_data); @@ -1071,17 +1021,15 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) uint8_t diversified_key[8] = { 0 }; // e-Purse uint8_t card_challenge_data[8] = { 0x00 }; - if(simulationMode == MODE_FULLSIM) - { + if (simulationMode == MODE_FULLSIM) { //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); + 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); - + cipher_state = opt_doTagMAC_1(card_challenge_data, diversified_key); } int exitLoop = 0; @@ -1097,7 +1045,6 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) uint8_t* trace_data = NULL; int trace_data_size = 0; - // Respond SOF -- takes 1 bytes uint8_t *resp_sof = BigBuf_malloc(2); int resp_sof_Len; @@ -1149,6 +1096,7 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) // Start from off (no field generated) //FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); //SpinDelay(200); + FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_TAGSIM_LISTEN); SpinDelay(20); StartCountSspClk(); @@ -1159,53 +1107,53 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) // To control where we are in the protocol int cmdsRecvd = 0; uint32_t time_0 = GetCountSspClk(); - uint32_t t2r_time =0; - uint32_t r2t_time =0; + uint32_t t2r_time = 0, r2t_time = 0; LED_A_ON(); bool buttonPressed = false; uint8_t response_delay = 1; - while(!exitLoop) { + while (!exitLoop) { response_delay = 1; LED_B_OFF(); //Signal tracer // Can be used to get a trigger for an oscilloscope.. LED_C_OFF(); - if(!GetIClassCommandFromReader(receivedCmd, &len, 100)) { + if (!GetIClassCommandFromReader(receivedCmd, &len, 100)) { buttonPressed = true; - break; + exitLoop = true; + continue; } r2t_time = GetCountSspClk(); //Signal tracer LED_C_ON(); // Okay, look at the command now. - if(receivedCmd[0] == ICLASS_CMD_ACTALL ) { + if (receivedCmd[0] == ICLASS_CMD_ACTALL ) { // Reader in anticollission phase modulated_response = resp_sof; modulated_response_size = resp_sof_Len; //order = 1; trace_data = sof_data; trace_data_size = sizeof(sof_data); - } else if(receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY && len == 1) { + } else if (receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY && len == 1) { // Reader asks for anticollission CSN modulated_response = resp_anticoll; modulated_response_size = resp_anticoll_len; //order = 2; trace_data = anticoll_data; trace_data_size = sizeof(anticoll_data); //DbpString("Reader requests anticollission CSN:"); - } else if(receivedCmd[0] == ICLASS_CMD_SELECT) { + } else if (receivedCmd[0] == ICLASS_CMD_SELECT) { // Reader selects anticollission CSN. // Tag sends the corresponding real CSN modulated_response = resp_csn; modulated_response_size = resp_csn_len; //order = 3; trace_data = csn_data; trace_data_size = sizeof(csn_data); //DbpString("Reader selects anticollission CSN:"); - } else if(receivedCmd[0] == ICLASS_CMD_READCHECK_KD) { + } else if (receivedCmd[0] == ICLASS_CMD_READCHECK_KD) { // Read e-purse (88 02) modulated_response = resp_cc; modulated_response_size = resp_cc_len; //order = 4; trace_data = card_challenge_data; trace_data_size = sizeof(card_challenge_data); LED_B_ON(); - } else if(receivedCmd[0] == ICLASS_CMD_CHECK) { + } else if (receivedCmd[0] == ICLASS_CMD_CHECK) { // Reader random and reader MAC!!! if(simulationMode == MODE_FULLSIM) { @@ -1220,34 +1168,35 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) modulated_response_size = ToSendMax; response_delay = 0;//We need to hurry here... //exitLoop = true; - }else - { //Not fullsim, we don't respond - // We do not know what to answer, so lets keep quiet + } else { + //Not fullsim, we don't respond + // We do not know what to answer, so lets keep quiet modulated_response = resp_sof; modulated_response_size = 0; - trace_data = NULL; - trace_data_size = 0; + trace_data = NULL; + trace_data_size = 0; + if (simulationMode == MODE_EXIT_AFTER_MAC){ - // dbprintf:ing ... - Dbprintf("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]); - Dbprintf("RDR: (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x",len, - receivedCmd[0], receivedCmd[1], receivedCmd[2], - receivedCmd[3], receivedCmd[4], receivedCmd[5], - receivedCmd[6], receivedCmd[7], receivedCmd[8]); - if (reader_mac_buf != NULL) - { - memcpy(reader_mac_buf,receivedCmd+1,8); + // dbprintf:ing ... + Dbprintf("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]); + Dbprintf("RDR: (len=%02d): %02x %02x %02x %02x %02x %02x %02x %02x %02x", len, + receivedCmd[0], receivedCmd[1], receivedCmd[2], + receivedCmd[3], receivedCmd[4], receivedCmd[5], + receivedCmd[6], receivedCmd[7], receivedCmd[8]); + + if (reader_mac_buf != NULL) { + memcpy(reader_mac_buf, receivedCmd+1, 8); + } + exitLoop = true; } - exitLoop = true; - } } - } else if(receivedCmd[0] == ICLASS_CMD_HALT && len == 1) { + } else if (receivedCmd[0] == ICLASS_CMD_HALT && len == 1) { // Reader ends the session modulated_response = resp_sof; modulated_response_size = 0; //order = 0; trace_data = NULL; trace_data_size = 0; - } else if(simulationMode == MODE_FULLSIM && receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY && len == 4){ + } else if (simulationMode == MODE_FULLSIM && receivedCmd[0] == ICLASS_CMD_READ_OR_IDENTIFY && len == 4){ //Read block uint16_t blk = receivedCmd[1]; //Take the data... @@ -1260,8 +1209,8 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) memcpy(data_response, ToSend, ToSendMax); modulated_response = data_response; modulated_response_size = ToSendMax; - }else if(receivedCmd[0] == ICLASS_CMD_UPDATE && simulationMode == MODE_FULLSIM) - {//Probably the reader wants to update the nonce. Let's just ignore that for now. + } else if (receivedCmd[0] == ICLASS_CMD_UPDATE && simulationMode == MODE_FULLSIM) { + //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| @@ -1276,15 +1225,13 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) memcpy(data_response, ToSend, ToSendMax); modulated_response = data_response; modulated_response_size = ToSendMax; - } - else if(receivedCmd[0] == ICLASS_CMD_PAGESEL) - {//Pagesel + } else if(receivedCmd[0] == ICLASS_CMD_PAGESEL) { + //Pagesel //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 - } - else { + } else { //#db# Unknown command received from reader (len=5): 26 1 0 f6 a 44 44 44 44 // Never seen this command before Dbprintf("Unhandled command received from reader (len=%d): %x %x %x %x %x %x %x %x %x", @@ -1299,47 +1246,45 @@ int doIClassSimulation( int simulationMode, uint8_t *reader_mac_buf) trace_data_size = 0; } - if(cmdsRecvd > 100) { - //DbpString("100 commands later..."); - //break; - } - else { - cmdsRecvd++; - } + cmdsRecvd++; +// if (cmdsRecvd > 999) { + //DbpString("999 commands later..."); + //exitLoop = true; + //continue; +// } + /** A legit tag has about 380us delay between reader EOT and tag SOF. **/ - if(modulated_response_size > 0) { + if (modulated_response_size > 0) { SendIClassAnswer(modulated_response, modulated_response_size, response_delay); - t2r_time = GetCountSspClk(); + t2r_time = (GetCountSspClk() - time_0) << 4; } if (tracing) { uint8_t parity[MAX_PARITY_SIZE]; GetParity(receivedCmd, len, parity); - LogTrace(receivedCmd,len, (r2t_time-time_0)<< 4, (r2t_time-time_0) << 4, parity, true); + LogTrace(receivedCmd, len, (r2t_time - time_0)<< 4, (r2t_time - time_0) << 4, parity, true); if (trace_data != NULL) { GetParity(trace_data, trace_data_size, parity); - LogTrace(trace_data, trace_data_size, (t2r_time-time_0) << 4, (t2r_time-time_0) << 4, parity, false); + LogTrace(trace_data, trace_data_size, t2r_time, t2r_time, parity, false); } - if(!tracing) + if (!tracing) DbpString("Trace full"); - } } LEDsoff(); - if(buttonPressed) + if (buttonPressed) DbpString("Button pressed"); return buttonPressed; } -static int SendIClassAnswer(uint8_t *resp, int respLen, int delay) -{ - int i = 0, d=0;//, u = 0, d = 0; +static int SendIClassAnswer(uint8_t *resp, int respLen, int delay) { + int i = 0, d = 0; uint8_t b = 0; //FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR|FPGA_HF_SIMULATOR_MODULATE_424K); @@ -1347,17 +1292,16 @@ static int SendIClassAnswer(uint8_t *resp, int respLen, int delay) AT91C_BASE_SSC->SSC_THR = 0x00; FpgaSetupSsc(); - while(!BUTTON_PRESS()) { - if((AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)){ + while (!BUTTON_PRESS()) { + if ( (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY)){ b = AT91C_BASE_SSC->SSC_RHR; (void) b; } - if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)){ + if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)){ b = 0x00; - if(d < delay) { + if (d < delay) { d++; - } - else { - if( i < respLen){ + } else { + if ( i < respLen){ b = resp[i]; //Hack //b = 0xAC; @@ -1366,11 +1310,9 @@ static int SendIClassAnswer(uint8_t *resp, int respLen, int delay) } AT91C_BASE_SSC->SSC_THR = b; } - -// if (i > respLen +4) break; - if (i > respLen +1) break; +// if (i > respLen + 4) break; + if (i > respLen + 1) break; } - return 0; } @@ -1379,8 +1321,7 @@ static int SendIClassAnswer(uint8_t *resp, int respLen, int delay) //----------------------------------------------------------------------------- // Transmit the command (to the tag) that was placed in ToSend[]. //----------------------------------------------------------------------------- -static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int *wait) -{ +static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int *wait) { int c; volatile uint32_t r; FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD); @@ -1388,33 +1329,30 @@ static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int FpgaSetupSsc(); if (wait) { - if(*wait < 10) *wait = 10; + if (*wait < 10) *wait = 10; - for(c = 0; c < *wait;) { - if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { + 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)) { - r = AT91C_BASE_SSC->SSC_RHR; - (void)r; + if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { + 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)) { + if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { // DOUBLE THE SAMPLES! - if(firstpart) { + if (firstpart) { sendbyte = (cmd[c] & 0xf0) | (cmd[c] >> 4); - } - else { + } else { sendbyte = (cmd[c] & 0x0f) | (cmd[c] << 4); c++; } @@ -1425,75 +1363,76 @@ static void TransmitIClassCommand(const uint8_t *cmd, int len, int *samples, int AT91C_BASE_SSC->SSC_THR = sendbyte; firstpart = !firstpart; - if(c >= len) break; + if (c >= len) break; } - if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { - r = AT91C_BASE_SSC->SSC_RHR; - (void)r; - } - + if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { + r = AT91C_BASE_SSC->SSC_RHR; (void)r; + } WDT_HIT(); } - if (samples && wait) *samples = (c + *wait) << 3; + + if (samples) { + if (wait) + *samples = (c + *wait) << 3; + else + *samples = c << 3; + } } //----------------------------------------------------------------------------- // Prepare iClass reader command to send to FPGA //----------------------------------------------------------------------------- -void CodeIClassCommand(const uint8_t * cmd, int len) -{ - int i, j, k; - uint8_t b; +void CodeIClassCommand(const uint8_t * cmd, int len) { + int i, j, k; + uint8_t b; - ToSendReset(); + ToSendReset(); - // Start of Communication: 1 out of 4 - ToSend[++ToSendMax] = 0xf0; - ToSend[++ToSendMax] = 0x00; - ToSend[++ToSendMax] = 0x0f; - ToSend[++ToSendMax] = 0x00; + // 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++) { - b = cmd[i]; - for(j = 0; j < 4; j++) { - for(k = 0; k < 4; k++) { - if(k == (b & 3)) { - ToSend[++ToSendMax] = 0xf0; + // Modulate the bytes + for (i = 0; i < len; i++) { + 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; } - else { - ToSend[++ToSendMax] = 0x00; - } - } - b >>= 2; - } - } + b >>= 2; + } + } - // End of Communication - ToSend[++ToSendMax] = 0x00; - ToSend[++ToSendMax] = 0x00; - ToSend[++ToSendMax] = 0xf0; - ToSend[++ToSendMax] = 0x00; + // End of Communication + ToSend[ToSendMax++] = 0x00; + ToSend[ToSendMax++] = 0x00; + ToSend[ToSendMax++] = 0xf0; + ToSend[ToSendMax++] = 0x00; - // Convert from last character reference to length - ToSendMax++; + // Convert from last character reference to length + ToSendMax++; } -void ReaderTransmitIClass(uint8_t* frame, int len) -{ - int wait = 0; - int samples = 0; +void ReaderTransmitIClass(uint8_t* frame, int len) { + int wait = 0; + int samples = 0; - // This is tied to other size changes - CodeIClassCommand(frame,len); + // This is tied to other size changes + CodeIClassCommand(frame,len); - // Select the card - TransmitIClassCommand(ToSend, ToSendMax, &samples, &wait); - if(trigger) - LED_A_ON(); + // Select the card + TransmitIClassCommand(ToSend, ToSendMax, &samples, &wait); + if(trigger) + LED_A_ON(); - // Store reader command in buffer + // Store reader command in buffer if (tracing) { uint8_t par[MAX_PARITY_SIZE]; GetParity(frame, len, par); @@ -1506,8 +1445,7 @@ void ReaderTransmitIClass(uint8_t* frame, int len) // 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 -{ +static int GetIClassAnswer(uint8_t *receivedResponse, int maxLen, int *samples, int *elapsed) { // buffer needs to be 512 bytes int c; @@ -1529,14 +1467,14 @@ static int GetIClassAnswer(uint8_t *receivedResponse, int maxLen, int *samples, for(;;) { WDT_HIT(); - if(BUTTON_PRESS()) return false; + if (BUTTON_PRESS()) return false; - if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { + 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) + if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { + if (c < timeout) c++; else return false; @@ -1545,34 +1483,36 @@ static int GetIClassAnswer(uint8_t *receivedResponse, int maxLen, int *samples, skip = !skip; - if(skip) continue; + if (skip) continue; - if(ManchesterDecoding(b & 0x0f)) { - *samples = c << 3; + if (ManchesterDecoding(b & 0x0f)) { + if (samples) + *samples = c << 3; return true; } } } } -int ReaderReceiveIClass(uint8_t* receivedAnswer) -{ +int ReaderReceiveIClass(uint8_t* receivedAnswer) { int samples = 0; - if (!GetIClassAnswer(receivedAnswer,160,&samples,0)) return false; + + if (!GetIClassAnswer(receivedAnswer, 160, &samples, NULL)) + return false; rsamples += samples; if (tracing) { uint8_t parity[MAX_PARITY_SIZE]; GetParity(receivedAnswer, Demod.len, parity); - LogTrace(receivedAnswer,Demod.len,rsamples,rsamples,parity,false); + LogTrace(receivedAnswer, Demod.len, rsamples, rsamples, parity, false); } - if(samples == 0) return false; + if (samples == 0) + return false; return Demod.len; } -void setupIclassReader() -{ +void setupIclassReader() { FpgaDownloadAndGo(FPGA_BITSTREAM_HF); // Reset trace buffer clear_trace(); @@ -1596,16 +1536,15 @@ void setupIclassReader() } -bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* resp, uint8_t expected_size, uint8_t retries) -{ - while(retries-- > 0) - { +bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* resp, uint8_t expected_size, uint8_t retries) { + while (retries-- > 0) { + ReaderTransmitIClass(command, cmdsize); - if(expected_size == ReaderReceiveIClass(resp)){ + + if (expected_size == ReaderReceiveIClass(resp)) return true; - } } - return false;//Error + return false; } /** @@ -1615,8 +1554,7 @@ bool sendCmdGetResponseWithRetries(uint8_t* command, size_t cmdsize, uint8_t* re * 1 = Got CSN * 2 = Got CSN and CC */ -uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) -{ +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 }; @@ -1634,12 +1572,12 @@ uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) // Send act_all ReaderTransmitIClass(act_all, 1); // Card present? - if(!ReaderReceiveIClass(resp)) return read_status;//Fail + if (!ReaderReceiveIClass(resp)) return read_status;//Fail //Send Identify ReaderTransmitIClass(identify, 1); //We expect a 10-byte response here, 8 byte anticollision-CSN and 2 byte CRC uint8_t len = ReaderReceiveIClass(resp); - if(len != 10) return read_status;//Fail + if (len != 10) return read_status;//Fail //Copy the Anti-collision CSN to our select-packet memcpy(&select[1],resp,8); @@ -1647,7 +1585,7 @@ uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) ReaderTransmitIClass(select, sizeof(select)); //We expect a 10-byte response here, 8 byte CSN and 2 byte CRC len = ReaderReceiveIClass(resp); - if(len != 10) return read_status;//Fail + if (len != 10) return read_status;//Fail //Success - level 1, we got CSN //Save CSN in response data @@ -1658,7 +1596,7 @@ uint8_t handshakeIclassTag_ext(uint8_t *card_data, bool use_credit_key) // Card selected, now read e-purse (cc) (only 8 bytes no CRC) ReaderTransmitIClass(readcheck_cc, sizeof(readcheck_cc)); - if(ReaderReceiveIClass(resp) == 8) { + if (ReaderReceiveIClass(resp) == 8) { //Save CC (e-purse) in response data memcpy(card_data+8,resp,8); read_status++; @@ -1670,17 +1608,18 @@ uint8_t handshakeIclassTag(uint8_t *card_data){ return handshakeIclassTag_ext(card_data, false); } - // Reader iClass Anticollission void ReaderIClass(uint8_t arg0) { 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 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}; @@ -1688,8 +1627,10 @@ void ReaderIClass(uint8_t arg0) { 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; @@ -1726,9 +1667,8 @@ void ReaderIClass(uint8_t arg0) { // 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 (flagReadConfig) { + if (sendCmdGetResponseWithRetries(readConf, sizeof(readConf), resp, 10, 10)) { result_status |= FLAG_ICLASS_READER_CONF; memcpy(card_data+8, resp, 8); } else { @@ -1737,9 +1677,8 @@ void ReaderIClass(uint8_t arg0) { } //Read block 5, AA - if(flagReadAA) { - if(sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, 10, 10)) - { + if (flagReadAA) { + if (sendCmdGetResponseWithRetries(readAA, sizeof(readAA), resp, 10, 10)) { result_status |= FLAG_ICLASS_READER_AA; memcpy(card_data+(8*5), resp, 8); } else { @@ -1759,10 +1698,10 @@ void ReaderIClass(uint8_t arg0) { 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 (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) { + 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) { LEDsoff(); @@ -1787,23 +1726,23 @@ void ReaderIClass(uint8_t arg0) { void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) { - uint8_t card_data[USB_CMD_DATA_SIZE]={0}; + uint8_t card_data[USB_CMD_DATA_SIZE] = {0}; uint16_t block_crc_LUT[255] = {0}; - {//Generate a lookup table for block crc - for(int block = 0; block < 255; block++){ - char bl = block; - block_crc_LUT[block] = iclass_crc16(&bl ,1); - } + //Generate a lookup table for block crc + for (int block = 0; block < 255; block++){ + char bl = block; + block_crc_LUT[block] = iclass_crc16(&bl ,1); } + //Dbprintf("Lookup table: %02x %02x %02x" ,block_crc_LUT[0],block_crc_LUT[1],block_crc_LUT[2]); - uint8_t check[] = { 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; - uint8_t read[] = { 0x0c, 0x00, 0x00, 0x00 }; + uint8_t check[] = { 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; + uint8_t read[] = { 0x0c, 0x00, 0x00, 0x00 }; uint16_t crc = 0; - uint8_t cardsize=0; - uint8_t mem=0; + uint8_t cardsize = 0; + uint8_t mem = 0; static struct memory_t{ int k16; @@ -1818,23 +1757,22 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) { setupIclassReader(); set_tracing(true); - while(!BUTTON_PRESS()) { + while (!BUTTON_PRESS()) { WDT_HIT(); - if(!tracing) { + if (!tracing) { DbpString("Trace full"); break; } uint8_t read_status = handshakeIclassTag(card_data); - if(read_status < 2) continue; + 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, 4, 5)) { Dbprintf("Error: Authentication Fail!"); continue; } @@ -1845,57 +1783,58 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) { read[2] = crc >> 8; read[3] = crc & 0xff; - if(!sendCmdGetResponseWithRetries(read, sizeof(read),resp, 10, 10)) - { + if (!sendCmdGetResponseWithRetries(read, sizeof(read),resp, 10, 10)) { Dbprintf("Dump config (block 1) failed"); continue; } - mem=resp[5]; - memory.k16= (mem & 0x80); - memory.book= (mem & 0x20); - memory.k2= (mem & 0x8); - memory.lockauth= (mem & 0x2); - memory.keyaccess= (mem & 0x1); + mem = resp[5]; + memory.k16 = (mem & 0x80); + memory.book = (mem & 0x20); + memory.k2 = (mem & 0x8); + memory.lockauth = (mem & 0x2); + memory.keyaccess = (mem & 0x1); cardsize = memory.k16 ? 255 : 32; WDT_HIT(); //Set card_data to all zeroes, we'll fill it with data - memset(card_data,0x0,USB_CMD_DATA_SIZE); - uint8_t failedRead =0; - uint32_t stored_data_length =0; + memset(card_data, 0x0, USB_CMD_DATA_SIZE); + uint8_t failedRead = 0; + uint32_t stored_data_length = 0; //then loop around remaining blocks - for(int block=0; block < cardsize; block++){ + for (int block=0; block < cardsize; block++) { - read[1]= block; + read[1] = block; crc = block_crc_LUT[block]; read[2] = crc >> 8; read[3] = crc & 0xff; - if(sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 10)) - { + if (sendCmdGetResponseWithRetries(read, sizeof(read), resp, 10, 10)) { Dbprintf(" %02x: %02x %02x %02x %02x %02x %02x %02x %02x", block, resp[0], resp[1], resp[2], resp[3], resp[4], resp[5], - resp[6], resp[7]); + resp[6], resp[7] + ); //Fill up the buffer - memcpy(card_data+stored_data_length,resp,8); + memcpy(card_data + stored_data_length, resp, 8); stored_data_length += 8; - if(stored_data_length +8 > USB_CMD_DATA_SIZE) - {//Time to send this off and start afresh + if (stored_data_length + 8 > USB_CMD_DATA_SIZE) { + //Time to send this off and start afresh cmd_send(CMD_ACK, stored_data_length,//data length failedRead,//Failed blocks? 0,//Not used ATM - card_data, stored_data_length); + card_data, + stored_data_length + ); //reset stored_data_length = 0; failedRead = 0; } } else { failedRead = 1; - stored_data_length +=8;//Otherwise, data becomes misaligned + stored_data_length += 8;//Otherwise, data becomes misaligned Dbprintf("Failed to dump block %d", block); } } @@ -1906,7 +1845,9 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) { stored_data_length,//data length failedRead,//Failed blocks? 0,//Not used ATM - card_data, stored_data_length); + card_data, + stored_data_length + ); } //If we got here, let's break break; @@ -1916,7 +1857,9 @@ void ReaderIClass_Replay(uint8_t arg0, uint8_t *MAC) { 0,//data length 0,//Failed blocks? 0,//Not used ATM - card_data, 0); + card_data, + 0 + ); LED_A_OFF(); set_tracing(false); @@ -1933,7 +1876,7 @@ void iClass_ReadCheck(uint8_t blockNo, uint8_t keyType) { void iClass_Authentication(uint8_t *MAC) { uint8_t check[] = { ICLASS_CMD_CHECK, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; uint8_t resp[ICLASS_BUFFER_SIZE]; - memcpy(check+5,MAC,4); + memcpy(check+5, MAC, 4); bool isOK; isOK = sendCmdGetResponseWithRetries(check, sizeof(check), resp, 4, 6); cmd_send(CMD_ACK,isOK,0,0,0,0); @@ -1950,7 +1893,6 @@ bool iClass_ReadBlock(uint8_t blockNo, uint8_t *readdata) { //readcmd[1] = blockNo; isOK = sendCmdGetResponseWithRetries(readcmd, sizeof(readcmd), resp, 10, 10); memcpy(readdata, resp, sizeof(resp)); - return isOK; } @@ -1976,18 +1918,18 @@ void iClass_Dump(uint8_t blockno, uint8_t numblks) { memset(dataout,0xFF,255*8); for (;blkCnt < numblks; blkCnt++) { - isOK = iClass_ReadBlock(blockno+blkCnt, readblockdata); + isOK = iClass_ReadBlock(blockno + blkCnt, readblockdata); if (!isOK || (readblockdata[0] == 0xBB || readblockdata[7] == 0xBB || readblockdata[2] == 0xBB)) { //try again - isOK = iClass_ReadBlock(blockno+blkCnt, readblockdata); + isOK = iClass_ReadBlock(blockno + blkCnt, readblockdata); if (!isOK) { - Dbprintf("Block %02X failed to read", blkCnt+blockno); + Dbprintf("Block %02X failed to read", blkCnt + blockno); break; } } - memcpy(dataout+(blkCnt*8),readblockdata,8); + memcpy(dataout + (blkCnt * 8), readblockdata, 8); } //return pointer to dump memory in arg3 - cmd_send(CMD_ACK,isOK,blkCnt,BigBuf_max_traceLen(),0,0); + cmd_send(CMD_ACK, isOK, blkCnt, BigBuf_max_traceLen(), 0, 0); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); LEDsoff(); BigBuf_free(); @@ -2005,13 +1947,16 @@ bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) { uint8_t resp[] = {0,0,0,0,0,0,0,0,0,0}; bool isOK = false; - isOK = sendCmdGetResponseWithRetries(write,sizeof(write),resp,sizeof(resp),10); + isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 10); 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); + + //if response is not equal to write values + if (memcmp(write + 2, resp, 8)) { + //if not programming key areas (note key blocks don't get programmed with actual key data it is xor data) + if (blockNo != 3 && blockNo != 4) { + //error try again + isOK = sendCmdGetResponseWithRetries(write, sizeof(write), resp, sizeof(resp), 10); } } @@ -2022,28 +1967,27 @@ bool iClass_WriteBlock_ext(uint8_t blockNo, uint8_t *data) { void iClass_WriteBlock(uint8_t blockNo, uint8_t *data) { bool isOK = iClass_WriteBlock_ext(blockNo, data); if (isOK) - Dbprintf("Write block [%02x] successful",blockNo); + Dbprintf("Write block [%02x] successful", blockNo); else - Dbprintf("Write block [%02x] failed",blockNo); + Dbprintf("Write block [%02x] failed", blockNo); cmd_send(CMD_ACK,isOK,0,0,0,0); } void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) { - int i; - int written = 0; + int i, written = 0; int total_block = (endblock - startblock) + 1; - for (i = 0; i < total_block;i++){ + for (i = 0; i < total_block; i++){ // block number - if (iClass_WriteBlock_ext(i+startblock, data+(i*12))){ - Dbprintf("Write block [%02x] successful",i + startblock); + if (iClass_WriteBlock_ext(i + startblock, data + ( i*12 ) )){ + Dbprintf("Write block [%02x] successful", i + startblock); written++; } else { - if (iClass_WriteBlock_ext(i+startblock, data+(i*12))){ - Dbprintf("Write block [%02x] successful",i + startblock); + if (iClass_WriteBlock_ext(i + startblock, data + ( i*12 ) )){ + Dbprintf("Write block [%02x] successful", i + startblock); written++; } else { - Dbprintf("Write block [%02x] failed",i + startblock); + Dbprintf("Write block [%02x] failed", i + startblock); } } } @@ -2055,4 +1999,4 @@ void iClass_Clone(uint8_t startblock, uint8_t endblock, uint8_t *data) { cmd_send(CMD_ACK,1,0,0,0,0); FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); LEDsoff(); -} +} \ No newline at end of file diff --git a/armsrc/iso15693.c b/armsrc/iso15693.c index 16912029b..c8824a81c 100644 --- a/armsrc/iso15693.c +++ b/armsrc/iso15693.c @@ -219,33 +219,38 @@ static void TransmitTo15693Tag(const uint8_t *cmd, int len, int *samples, int *w int c; volatile uint32_t r; FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX); - 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)) { -// r = AT91C_BASE_SSC->SSC_RHR; -// (void)r; -// } -// WDT_HIT(); -// } + + 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)) { + r = AT91C_BASE_SSC->SSC_RHR; (void)r; + } + WDT_HIT(); + } + } c = 0; for(;;) { - if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { + if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { AT91C_BASE_SSC->SSC_THR = cmd[c]; if( ++c >= len) break; } - if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { - r = AT91C_BASE_SSC->SSC_RHR; - (void)r; + if (AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { + r = AT91C_BASE_SSC->SSC_RHR; (void)r; } WDT_HIT(); } - *samples = (c + *wait) << 3; + if (samples) { + if (wait) + *samples = (c + *wait) << 3; + else + *samples = c << 3; + } } //----------------------------------------------------------------------------- @@ -256,20 +261,36 @@ static void TransmitTo15693Reader(const uint8_t *cmd, int len, int *samples, int int c = 0; volatile uint32_t r; FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_SIMULATOR|FPGA_HF_SIMULATOR_MODULATE_424K); - if(*wait < 10) { *wait = 10; } - + 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)) { + r = AT91C_BASE_SSC->SSC_RHR; (void)r; + } + WDT_HIT(); + } + } + for(;;) { if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_TXRDY)) { AT91C_BASE_SSC->SSC_THR = cmd[c]; if( ++c >= len) break; } if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { - r = AT91C_BASE_SSC->SSC_RHR; - (void)r; + r = AT91C_BASE_SSC->SSC_RHR; (void)r; } WDT_HIT(); } - *samples = (c + *wait) << 3; + if (samples) { + if (wait) + *samples = (c + *wait) << 3; + else + *samples = c << 3; + } } diff --git a/client/cmdhf15.c b/client/cmdhf15.c index d17e7cd1f..691a09ae7 100644 --- a/client/cmdhf15.c +++ b/client/cmdhf15.c @@ -236,7 +236,7 @@ int getUID(uint8_t *buf) // get a product description based on the UID // uid[8] tag uid // returns description of the best match -static char* getTagInfo(uint8_t *uid) { +static char* getTagInfo_15(uint8_t *uid) { uint64_t myuid, mask; int i = 0, best = -1; memcpy(&myuid, uid, sizeof(uint64_t)); @@ -381,8 +381,8 @@ int HF15Reader(const char *Cmd, bool verbose) return 0; } - PrintAndLog("Tag UID : %s",sprintUID(NULL,uid)); - PrintAndLog("Tag Info: %s",getTagInfo(uid)); + PrintAndLog("Tag UID : %s", sprintUID(NULL,uid)); + PrintAndLog("Tag Info: %s", getTagInfo_15(uid)); return 1; } @@ -447,18 +447,18 @@ int CmdHF15DumpMem(const char*Cmd) { return 0; } - PrintAndLog("Reading memory from tag UID=%s",sprintUID(NULL,uid)); - PrintAndLog("Tag Info: %s",getTagInfo(uid)); + PrintAndLog("Reading memory from tag UID=%s", sprintUID(NULL, uid)); + PrintAndLog("Tag Info: %s", getTagInfo_15(uid)); for (int retry=0; retry<5; retry++) { req[0]= ISO15_REQ_SUBCARRIER_SINGLE | ISO15_REQ_DATARATE_HIGH | ISO15_REQ_NONINVENTORY | ISO15_REQ_ADDRESS; req[1]=ISO15_CMD_READ; - memcpy(&req[2],uid,8); - req[10]=blocknum; - reqlen=AddCrc(req,11); - c.arg[0]=reqlen; + memcpy(&req[2], uid, 8); + req[10] = blocknum; + reqlen = AddCrc(req, 11); + c.arg[0] = reqlen; SendCommand(&c); @@ -549,10 +549,10 @@ int CmdHF15CmdInquiry(const char *Cmd) if (WaitForResponseTimeout(CMD_ACK,&resp,1000)) { if (resp.arg[0]>=12) { recv = resp.d.asBytes; - PrintAndLog("UID=%s",sprintUID(NULL,&recv[2])); - PrintAndLog("Tag Info: %s",getTagInfo(&recv[2])); + PrintAndLog("UID=%s", sprintUID(NULL, &recv[2])); + PrintAndLog("Tag Info: %s", getTagInfo_15(&recv[2])); } else { - PrintAndLog("Response to short, just %i bytes. No tag?\n",resp.arg[0]); + PrintAndLog("Response to short, just %i bytes. No tag?\n", resp.arg[0]); } } else { PrintAndLog("timeout."); @@ -813,14 +813,14 @@ int CmdHF15CmdSysinfo(const char *Cmd) { if (!(recv[0] & ISO15_RES_ERROR)) { *output=0; // reset outputstring for ( i=1; i 3) - { + if (simType > 3) { PrintAndLog("Undefined simptype %d", simType); return usage_hf_iclass_sim(); } - uint8_t numberOfCSNs=0; - if(simType == 2) - { + uint8_t numberOfCSNs = 0; + if (simType == 2) { UsbCommand c = {CMD_SIMULATE_TAG_ICLASS, {simType,NUM_CSNS}}; UsbCommand resp = {0}; @@ -283,7 +280,7 @@ int CmdHFiClassSim(const char *Cmd) { 0X0C, 0X90, 0X32, 0XF3, 0X5D, 0XFF, 0X12, 0XE0 // 10,13 }; -/* +/* 00 13 94 7e 76 ff 12 e0 // pre-defined 15 CSN by Carl55 // but new entry[0] by iceman uint8_t csns[8*NUM_CSNS] = { @@ -328,13 +325,13 @@ int CmdHFiClassSim(const char *Cmd) { * CC are all zeroes, CSN is the same as was sent in **/ void* dump = malloc(datalen); - memset(dump,0,datalen);//<-- Need zeroes for the CC-field + memset(dump, 0, datalen);//<-- Need zeroes for the CC-field uint8_t i = 0; - for(i = 0 ; i < NUM_CSNS ; i++) { - memcpy(dump+i*24, csns+i*8, 8); //CSN + for (i = 0 ; i < NUM_CSNS ; i++) { + memcpy(dump + i*24, csns + i*8, 8); //CSN //8 zero bytes here... //Then comes NR_MAC (eight bytes from the response) - memcpy(dump+i*24+16, resp.d.asBytes+i*8, 8); + memcpy(dump + i*24 + 16, resp.d.asBytes + i*8, 8); } /** Now, save to dumpfile **/ saveFile("iclass_mac_attack", "bin", dump, datalen);