X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9ab7a6c75566a2d06e56a8a97173c6382a3c5b3d..7e758047e4acf6f8db0178564691d20af38986ab:/armsrc/iso14443a.c?ds=sidebyside diff --git a/armsrc/iso14443a.c b/armsrc/iso14443a.c index e60f3198..e228b7fd 100644 --- a/armsrc/iso14443a.c +++ b/armsrc/iso14443a.c @@ -1,8 +1,13 @@ //----------------------------------------------------------------------------- -// Routines to support ISO 14443 type A. -// // Gerhard de Koning Gans - May 2008 +// +// This code is licensed to you under the terms of the GNU GPL, version 2 or, +// at your option, any later version. See the LICENSE.txt file for the text of +// the license. //----------------------------------------------------------------------------- +// Routines to support ISO 14443 type A. +//----------------------------------------------------------------------------- + #include "proxmark3.h" #include "apps.h" #include "util.h" @@ -15,14 +20,20 @@ static int traceLen = 0; static int rsamples = 0; static int tracing = TRUE; -typedef enum { - SEC_D = 1, - SEC_E = 2, - SEC_F = 3, - SEC_X = 4, - SEC_Y = 5, - SEC_Z = 6 -} SecType; +// CARD TO READER +// Sequence D: 11110000 modulation with subcarrier during first half +// Sequence E: 00001111 modulation with subcarrier during second half +// Sequence F: 00000000 no modulation with subcarrier +// READER TO CARD +// Sequence X: 00001100 drop after half a period +// Sequence Y: 00000000 no drop +// Sequence Z: 11000000 drop at start +#define SEC_D 0xf0 +#define SEC_E 0x0f +#define SEC_F 0x00 +#define SEC_X 0x0c +#define SEC_Y 0x00 +#define SEC_Z 0xc0 static const uint8_t OddByteParity[256] = { 1, 0, 0, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, @@ -96,11 +107,6 @@ int LogTrace(const uint8_t * btBytes, int iLen, int iSamples, uint32_t dwParity, return TRUE; } -int LogTraceInfo(byte_t* data, size_t len) -{ - return LogTrace(data,len,0,GetParity(data,len),TRUE); -} - //----------------------------------------------------------------------------- // The software UART that receives commands from the reader, and its state // variables. @@ -603,7 +609,7 @@ void SnoopIso14443a(void) // 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. - int triggered = TRUE; // FALSE to wait first for card + int triggered = FALSE; // FALSE to wait first for card // The command (reader -> tag) that we're receiving. // The length of a received command will in most cases be no more than 18 bytes. @@ -636,6 +642,12 @@ void SnoopIso14443a(void) Demod.len = 0; Demod.state = DEMOD_UNSYNCD; + // Setup for the DMA. + FpgaSetupSsc(); + upTo = dmaBuf; + lastRxCounter = DMA_BUFFER_SIZE; + FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE); + // And the reader -> tag commands memset(&Uart, 0, sizeof(Uart)); Uart.output = receivedCmd; @@ -648,28 +660,23 @@ void SnoopIso14443a(void) FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_SNIFFER); SetAdcMuxFor(GPIO_MUXSEL_HIPKD); - // Setup for the DMA. - FpgaSetupSsc(); - upTo = dmaBuf; - lastRxCounter = DMA_BUFFER_SIZE; - FpgaSetupSscDma((uint8_t *)dmaBuf, DMA_BUFFER_SIZE); - - LED_A_ON(); // And now we loop, receiving samples. for(;;) { - WDT_HIT(); + LED_A_ON(); + WDT_HIT(); int behindBy = (lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR) & (DMA_BUFFER_SIZE-1); if(behindBy > maxBehindBy) { maxBehindBy = behindBy; if(behindBy > 400) { - DbpString("blew circular buffer!"); + Dbprintf("blew circular buffer! behindBy=0x%x", behindBy); goto done; } } if(behindBy < 1) continue; + LED_A_OFF(); smpl = upTo[0]; upTo++; lastRxCounter -= 1; @@ -681,60 +688,58 @@ void SnoopIso14443a(void) } samples += 4; -#define HANDLE_BIT_IF_BODY \ - LED_C_ON(); \ - if(triggered) { \ - trace[traceLen++] = ((rsamples >> 0) & 0xff); \ - trace[traceLen++] = ((rsamples >> 8) & 0xff); \ - trace[traceLen++] = ((rsamples >> 16) & 0xff); \ - trace[traceLen++] = ((rsamples >> 24) & 0xff); \ - trace[traceLen++] = ((Uart.parityBits >> 0) & 0xff); \ - trace[traceLen++] = ((Uart.parityBits >> 8) & 0xff); \ - trace[traceLen++] = ((Uart.parityBits >> 16) & 0xff); \ - trace[traceLen++] = ((Uart.parityBits >> 24) & 0xff); \ - trace[traceLen++] = Uart.byteCnt; \ - memcpy(trace+traceLen, receivedCmd, Uart.byteCnt); \ - traceLen += Uart.byteCnt; \ - if(traceLen > TRACE_LENGTH) break; \ - } \ - /* And ready to receive another command. */ \ - Uart.state = STATE_UNSYNCD; \ - /* And also reset the demod code, which might have been */ \ - /* false-triggered by the commands from the reader. */ \ - Demod.state = DEMOD_UNSYNCD; \ - LED_B_OFF(); \ - - if(MillerDecoding((smpl & 0xF0) >> 4)) { + if(MillerDecoding((smpl & 0xF0) >> 4)) { rsamples = samples - Uart.samples; - HANDLE_BIT_IF_BODY + LED_C_ON(); + if(triggered) { + trace[traceLen++] = ((rsamples >> 0) & 0xff); + trace[traceLen++] = ((rsamples >> 8) & 0xff); + trace[traceLen++] = ((rsamples >> 16) & 0xff); + trace[traceLen++] = ((rsamples >> 24) & 0xff); + trace[traceLen++] = ((Uart.parityBits >> 0) & 0xff); + trace[traceLen++] = ((Uart.parityBits >> 8) & 0xff); + trace[traceLen++] = ((Uart.parityBits >> 16) & 0xff); + trace[traceLen++] = ((Uart.parityBits >> 24) & 0xff); + trace[traceLen++] = Uart.byteCnt; + memcpy(trace+traceLen, receivedCmd, Uart.byteCnt); + traceLen += Uart.byteCnt; + if(traceLen > TRACE_LENGTH) break; + } + /* And ready to receive another command. */ + Uart.state = STATE_UNSYNCD; + /* And also reset the demod code, which might have been */ + /* false-triggered by the commands from the reader. */ + Demod.state = DEMOD_UNSYNCD; + LED_B_OFF(); } - if(ManchesterDecoding(smpl & 0x0F)) { - rsamples = samples - Demod.samples; - LED_B_ON(); - - // timestamp, as a count of samples - trace[traceLen++] = ((rsamples >> 0) & 0xff); - trace[traceLen++] = ((rsamples >> 8) & 0xff); - trace[traceLen++] = ((rsamples >> 16) & 0xff); - trace[traceLen++] = 0x80 | ((rsamples >> 24) & 0xff); - trace[traceLen++] = ((Demod.parityBits >> 0) & 0xff); - trace[traceLen++] = ((Demod.parityBits >> 8) & 0xff); - trace[traceLen++] = ((Demod.parityBits >> 16) & 0xff); - trace[traceLen++] = ((Demod.parityBits >> 24) & 0xff); - // length - trace[traceLen++] = Demod.len; - memcpy(trace+traceLen, receivedResponse, Demod.len); - traceLen += Demod.len; - if(traceLen > TRACE_LENGTH) break; - - triggered = TRUE; + + if(ManchesterDecoding(smpl & 0x0F)) { + rsamples = samples - Demod.samples; + LED_B_ON(); + + // timestamp, as a count of samples + trace[traceLen++] = ((rsamples >> 0) & 0xff); + trace[traceLen++] = ((rsamples >> 8) & 0xff); + trace[traceLen++] = ((rsamples >> 16) & 0xff); + trace[traceLen++] = 0x80 | ((rsamples >> 24) & 0xff); + trace[traceLen++] = ((Demod.parityBits >> 0) & 0xff); + trace[traceLen++] = ((Demod.parityBits >> 8) & 0xff); + trace[traceLen++] = ((Demod.parityBits >> 16) & 0xff); + trace[traceLen++] = ((Demod.parityBits >> 24) & 0xff); + // length + trace[traceLen++] = Demod.len; + memcpy(trace+traceLen, receivedResponse, Demod.len); + traceLen += Demod.len; + if(traceLen > TRACE_LENGTH) break; + + triggered = TRUE; // And ready to receive another response. memset(&Demod, 0, sizeof(Demod)); Demod.output = receivedResponse; Demod.state = DEMOD_UNSYNCD; - LED_C_OFF(); - } + LED_C_OFF(); + } if(BUTTON_PRESS()) { DbpString("cancelled_a"); @@ -757,47 +762,6 @@ done: LED_D_OFF(); } -// Prepare communication bits to send to FPGA -void Sequence(SecType seq) -{ - ToSendMax++; - switch(seq) { - // CARD TO READER - case SEC_D: - // Sequence D: 11110000 - // modulation with subcarrier during first half - ToSend[ToSendMax] = 0xf0; - break; - case SEC_E: - // Sequence E: 00001111 - // modulation with subcarrier during second half - ToSend[ToSendMax] = 0x0f; - break; - case SEC_F: - // Sequence F: 00000000 - // no modulation with subcarrier - ToSend[ToSendMax] = 0x00; - break; - // READER TO CARD - case SEC_X: - // Sequence X: 00001100 - // drop after half a period - ToSend[ToSendMax] = 0x0c; - break; - case SEC_Y: - default: - // Sequence Y: 00000000 - // no drop - ToSend[ToSendMax] = 0x00; - break; - case SEC_Z: - // Sequence Z: 11000000 - // drop at start - ToSend[ToSendMax] = 0xc0; - break; - } -} - //----------------------------------------------------------------------------- // Prepare tag messages //----------------------------------------------------------------------------- @@ -819,7 +783,7 @@ static void CodeIso14443aAsTag(const uint8_t *cmd, int len) ToSendStuffBit(0); // Send startbit - Sequence(SEC_D); + ToSend[++ToSendMax] = SEC_D; for(i = 0; i < len; i++) { int j; @@ -830,27 +794,27 @@ static void CodeIso14443aAsTag(const uint8_t *cmd, int len) for(j = 0; j < 8; j++) { oddparity ^= (b & 1); if(b & 1) { - Sequence(SEC_D); + ToSend[++ToSendMax] = SEC_D; } else { - Sequence(SEC_E); + ToSend[++ToSendMax] = SEC_E; } b >>= 1; } // Parity bit if(oddparity) { - Sequence(SEC_D); + ToSend[++ToSendMax] = SEC_D; } else { - Sequence(SEC_E); + ToSend[++ToSendMax] = SEC_E; } } // Send stopbit - Sequence(SEC_F); + ToSend[++ToSendMax] = SEC_F; // Flush the buffer in FPGA!! for(i = 0; i < 5; i++) { - Sequence(SEC_F); + ToSend[++ToSendMax] = SEC_F; } // Convert from last byte pos to length @@ -882,23 +846,23 @@ static void CodeStrangeAnswer() ToSendStuffBit(0); // Send startbit - Sequence(SEC_D); + ToSend[++ToSendMax] = SEC_D; // 0 - Sequence(SEC_E); + ToSend[++ToSendMax] = SEC_E; // 0 - Sequence(SEC_E); + ToSend[++ToSendMax] = SEC_E; // 1 - Sequence(SEC_D); + ToSend[++ToSendMax] = SEC_D; // Send stopbit - Sequence(SEC_F); + ToSend[++ToSendMax] = SEC_F; // Flush the buffer in FPGA!! for(i = 0; i < 5; i++) { - Sequence(SEC_F); + ToSend[++ToSendMax] = SEC_F; } // Convert from last byte pos to length @@ -969,8 +933,6 @@ void SimulateIso14443aTag(int tagType, int TagUid) // static const uint8_t cmd2[] = { 0x93, 0x20 }; //static const uint8_t response2[] = { 0x9a, 0xe5, 0xe4, 0x43, 0xd8 }; // original value - greg - - // my desfire static const uint8_t response2[] = { 0x88, 0x04, 0x21, 0x3f, 0x4d }; // known uid - note cascade (0x88), 2nd byte (0x04) = NXP/Phillips @@ -984,7 +946,6 @@ ComputeCrc14443(CRC_14443_A, response3, 1, &response3[1], &response3[2]); static const uint8_t response2a[] = { 0x51, 0x48, 0x1d, 0x80, 0x84 }; // uid - cascade2 - 2nd half (4 bytes) of UID+ BCCheck // NOTE : THE CRC on the above may be wrong as I have obfuscated the actual UID - // When reader selects us during cascade2 it will send cmd3a //uint8_t response3a[] = { 0x00, 0x00, 0x00 }; // SAK Select (cascade2) successful response (ULTRALITE) uint8_t response3a[] = { 0x20, 0x00, 0x00 }; // SAK Select (cascade2) successful response (DESFire) @@ -1008,7 +969,6 @@ ComputeCrc14443(CRC_14443_A, response3a, 1, &response3a[1], &response3a[2]); // 166 bytes, since every bit that needs to be send costs us a byte // - // Respond with card type uint8_t *resp1 = (((uint8_t *)BigBuf) + 800); int resp1Len; @@ -1283,86 +1243,6 @@ static void TransmitFor14443a(const uint8_t *cmd, int len, int *samples, int *wa if (samples) *samples = (c + *wait) << 3; } -//----------------------------------------------------------------------------- -// To generate an arbitrary stream from reader -// -//----------------------------------------------------------------------------- -void ArbitraryFromReader(const uint8_t *cmd, int parity, int len) -{ - int i; - int j; - int last; - uint8_t b; - - ToSendReset(); - - // Start of Communication (Seq. Z) - Sequence(SEC_Z); - last = 0; - - for(i = 0; i < len; i++) { - // Data bits - b = cmd[i]; - for(j = 0; j < 8; j++) { - if(b & 1) { - // Sequence X - Sequence(SEC_X); - last = 1; - } else { - if(last == 0) { - // Sequence Z - Sequence(SEC_Z); - } - else { - // Sequence Y - Sequence(SEC_Y); - last = 0; - } - } - b >>= 1; - - } - - // Predefined parity bit, the flipper flips when needed, because of flips in byte sent - if(((parity >> (len - i - 1)) & 1)) { - // Sequence X - Sequence(SEC_X); - last = 1; - } else { - if(last == 0) { - // Sequence Z - Sequence(SEC_Z); - } - else { - // Sequence Y - Sequence(SEC_Y); - last = 0; - } - } - } - - // End of Communication - if(last == 0) { - // Sequence Z - Sequence(SEC_Z); - } - else { - // Sequence Y - Sequence(SEC_Y); - last = 0; - } - // Sequence Y - Sequence(SEC_Y); - - // Just to be sure! - Sequence(SEC_Y); - Sequence(SEC_Y); - Sequence(SEC_Y); - - // Convert from last character reference to length - ToSendMax++; -} - //----------------------------------------------------------------------------- // Code a 7-bit command without parity bit // This is especially for 0x26 and 0x52 (REQA and WUPA) @@ -1376,23 +1256,23 @@ void ShortFrameFromReader(const uint8_t bt) ToSendReset(); // Start of Communication (Seq. Z) - Sequence(SEC_Z); + ToSend[++ToSendMax] = SEC_Z; last = 0; b = bt; for(j = 0; j < 7; j++) { if(b & 1) { // Sequence X - Sequence(SEC_X); + ToSend[++ToSendMax] = SEC_X; last = 1; } else { if(last == 0) { // Sequence Z - Sequence(SEC_Z); + ToSend[++ToSendMax] = SEC_Z; } else { // Sequence Y - Sequence(SEC_Y); + ToSend[++ToSendMax] = SEC_Y; last = 0; } } @@ -1402,20 +1282,20 @@ void ShortFrameFromReader(const uint8_t bt) // End of Communication if(last == 0) { // Sequence Z - Sequence(SEC_Z); + ToSend[++ToSendMax] = SEC_Z; } else { // Sequence Y - Sequence(SEC_Y); + ToSend[++ToSendMax] = SEC_Y; last = 0; } // Sequence Y - Sequence(SEC_Y); + ToSend[++ToSendMax] = SEC_Y; // Just to be sure! - Sequence(SEC_Y); - Sequence(SEC_Y); - Sequence(SEC_Y); + ToSend[++ToSendMax] = SEC_Y; + ToSend[++ToSendMax] = SEC_Y; + ToSend[++ToSendMax] = SEC_Y; // Convert from last character reference to length ToSendMax++; @@ -1434,7 +1314,7 @@ void CodeIso14443aAsReaderPar(const uint8_t * cmd, int len, uint32_t dwParity) ToSendReset(); // Start of Communication (Seq. Z) - Sequence(SEC_Z); + ToSend[++ToSendMax] = SEC_Z; last = 0; // Generate send structure for the data bits @@ -1445,15 +1325,15 @@ void CodeIso14443aAsReaderPar(const uint8_t * cmd, int len, uint32_t dwParity) for (j = 0; j < 8; j++) { if (b & 1) { // Sequence X - Sequence(SEC_X); + ToSend[++ToSendMax] = SEC_X; last = 1; } else { if (last == 0) { // Sequence Z - Sequence(SEC_Z); + ToSend[++ToSendMax] = SEC_Z; } else { // Sequence Y - Sequence(SEC_Y); + ToSend[++ToSendMax] = SEC_Y; last = 0; } } @@ -1463,15 +1343,15 @@ void CodeIso14443aAsReaderPar(const uint8_t * cmd, int len, uint32_t dwParity) // Get the parity bit if ((dwParity >> i) & 0x01) { // Sequence X - Sequence(SEC_X); + ToSend[++ToSendMax] = SEC_X; last = 1; } else { if (last == 0) { // Sequence Z - Sequence(SEC_Z); + ToSend[++ToSendMax] = SEC_Z; } else { // Sequence Y - Sequence(SEC_Y); + ToSend[++ToSendMax] = SEC_Y; last = 0; } } @@ -1480,19 +1360,19 @@ void CodeIso14443aAsReaderPar(const uint8_t * cmd, int len, uint32_t dwParity) // End of Communication if (last == 0) { // Sequence Z - Sequence(SEC_Z); + ToSend[++ToSendMax] = SEC_Z; } else { // Sequence Y - Sequence(SEC_Y); + ToSend[++ToSendMax] = SEC_Y; last = 0; } // Sequence Y - Sequence(SEC_Y); + ToSend[++ToSendMax] = SEC_Y; // Just to be sure! - Sequence(SEC_Y); - Sequence(SEC_Y); - Sequence(SEC_Y); + ToSend[++ToSendMax] = SEC_Y; + ToSend[++ToSendMax] = SEC_Y; + ToSend[++ToSendMax] = SEC_Y; // Convert from last character reference to length ToSendMax++; @@ -1531,9 +1411,9 @@ static int GetIso14443aAnswerFromTag(uint8_t *receivedResponse, int maxLen, int if (elapsed) (*elapsed)++; } if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) { - if(c < 512) { c++; } else { return FALSE; } + if(c < 2048) { c++; } else { return FALSE; } b = (uint8_t)AT91C_BASE_SSC->SSC_RHR; - if(ManchesterDecoding((b & 0xf0) >> 4)) { + if(ManchesterDecoding((b>>4) & 0xf)) { *samples = ((c - 1) << 3) + 4; return TRUE; } @@ -1587,113 +1467,126 @@ int ReaderReceive(uint8_t* receivedAnswer) int samples = 0; if (!GetIso14443aAnswerFromTag(receivedAnswer,100,&samples,0)) return FALSE; if (tracing) LogTrace(receivedAnswer,Demod.len,samples,Demod.parityBits,FALSE); - return TRUE; + if(samples == 0) return FALSE; + return Demod.len; } -//----------------------------------------------------------------------------- -// Read an ISO 14443a tag. Send out commands and store answers. -// -//----------------------------------------------------------------------------- -void ReaderIso14443a(uint32_t parameter) -{ - // Anticollision +/* performs iso14443a anticolision procedure + * fills the uid pointer */ +int iso14443a_select_card(uint8_t * uid_ptr) { uint8_t wupa[] = { 0x52 }; uint8_t sel_all[] = { 0x93,0x20 }; uint8_t sel_uid[] = { 0x93,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; uint8_t sel_all_c2[] = { 0x95,0x20 }; uint8_t sel_uid_c2[] = { 0x95,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; + uint8_t rats[] = { 0xE0,0x80,0x00,0x00 }; // FSD=256, FSDI=8, CID=0 - // Mifare AUTH - uint8_t mf_auth[] = { 0x60,0x00,0xf5,0x7b }; -// uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00 }; + uint8_t* resp = (((uint8_t *)BigBuf) + 3560); // was 3560 - tied to other size changes + uint8_t* uid = resp + 7; - uint8_t* receivedAnswer = (((uint8_t *)BigBuf) + 3560); // was 3560 - tied to other size changes - traceLen = 0; + int len; - // Setup SSC - FpgaSetupSsc(); + // Broadcast for a card, WUPA (0x52) will force response from all cards in the field + ReaderTransmitShort(wupa); + // Receive the ATQA + if(!ReaderReceive(resp)) return 0; + // if(*(uint16_t *) resp == 0x4403) MIFARE_CLASSIC + // if(*(uint16_t *) resp == 0x0400) MIFARE_DESFIRE - // Start from off (no field generated) - // Signal field is off with the appropriate LED - LED_D_OFF(); - FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); - SpinDelay(200); + ReaderTransmit(sel_all,sizeof(sel_all)); // SELECT_ALL + if(!ReaderReceive(uid)) return 0; - SetAdcMuxFor(GPIO_MUXSEL_HIPKD); - FpgaSetupSsc(); + // Construct SELECT UID command + // First copy the 5 bytes (Mifare Classic) after the 93 70 + memcpy(sel_uid+2,uid,5); + // Secondly compute the two CRC bytes at the end + AppendCrc14443a(sel_uid,7); - // Now give it time to spin up. - // Signal field is on with the appropriate LED - LED_D_ON(); - FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD); - SpinDelay(200); + ReaderTransmit(sel_uid,sizeof(sel_uid)); + // Receive the SAK + if (!ReaderReceive(resp)) return 0; - LED_A_ON(); - LED_B_OFF(); - LED_C_OFF(); + // OK we have selected at least at cascade 1, lets see if first byte of UID was 0x88 in + // which case we need to make a cascade 2 request and select - this is a long UID + // When the UID is not complete, the 3nd bit (from the right) is set in the SAK. + if (resp[0] &= 0x04) + { + ReaderTransmit(sel_all_c2,sizeof(sel_all_c2)); + if (!ReaderReceive(uid+5)) return 0; - while(traceLen < TRACE_LENGTH) - { - // Broadcast for a card, WUPA (0x52) will force response from all cards in the field - ReaderTransmitShort(wupa); - - // Test if the action was cancelled - if(BUTTON_PRESS()) { - break; - } - - // Receive the ATQA - if (!ReaderReceive(receivedAnswer)) continue; + // Construct SELECT UID command + memcpy(sel_uid_c2+2,uid+5,5); + AppendCrc14443a(sel_uid_c2,7); + ReaderTransmit(sel_uid_c2,sizeof(sel_uid_c2)); + // Receive the SAK + if (!ReaderReceive(resp)) return 0; + } + if(uid_ptr) memcpy(uid_ptr, uid, 10); + if( (resp[0] & 0x20) == 0) + return 2; // non iso14443a compliant tag + // Request for answer to select + AppendCrc14443a(rats, 2); + ReaderTransmit(rats, sizeof(rats)); + if (!(len = ReaderReceive(resp))) return 0; + return 1; +} - // Transmit SELECT_ALL - ReaderTransmit(sel_all,sizeof(sel_all)); +void iso14443a_setup() { + // Setup SSC + FpgaSetupSsc(); + // Start from off (no field generated) + // Signal field is off with the appropriate LED + LED_D_OFF(); + FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); + SpinDelay(200); - // Receive the UID - if (!ReaderReceive(receivedAnswer)) continue; + SetAdcMuxFor(GPIO_MUXSEL_HIPKD); - // Construct SELECT UID command - // First copy the 5 bytes (Mifare Classic) after the 93 70 - memcpy(sel_uid+2,receivedAnswer,5); - // Secondly compute the two CRC bytes at the end - AppendCrc14443a(sel_uid,7); + // Now give it time to spin up. + // Signal field is on with the appropriate LED + LED_D_ON(); + FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD); + SpinDelay(200); +} - // Transmit SELECT_UID - ReaderTransmit(sel_uid,sizeof(sel_uid)); +//----------------------------------------------------------------------------- +// Read an ISO 14443a tag. Send out commands and store answers. +// +//----------------------------------------------------------------------------- +void ReaderIso14443a(uint32_t parameter) +{ - // Receive the SAK - if (!ReaderReceive(receivedAnswer)) continue; + // Mifare AUTH + uint8_t mf_auth[] = { 0x60,0x00,0xf5,0x7b }; +// uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00 }; - // OK we have selected at least at cascade 1, lets see if first byte of UID was 0x88 in - // which case we need to make a cascade 2 request and select - this is a long UID - // When the UID is not complete, the 3nd bit (from the right) is set in the SAK. - if (receivedAnswer[0] &= 0x04) - { - // Transmit SELECT_ALL - ReaderTransmit(sel_all_c2,sizeof(sel_all_c2)); + uint8_t* receivedAnswer = (((uint8_t *)BigBuf) + 3560); // was 3560 - tied to other size changes + traceLen = 0; - // Receive the UID - if (!ReaderReceive(receivedAnswer)) continue; + iso14443a_setup(); - // Construct SELECT UID command - memcpy(sel_uid_c2+2,receivedAnswer,5); - // Secondly compute the two CRC bytes at the end - AppendCrc14443a(sel_uid_c2,7); + LED_A_ON(); + LED_B_OFF(); + LED_C_OFF(); - // Transmit SELECT_UID - ReaderTransmit(sel_uid_c2,sizeof(sel_uid_c2)); + while(traceLen < TRACE_LENGTH) + { + // Test if the action was cancelled + if(BUTTON_PRESS()) break; - // Receive the SAK - if (!ReaderReceive(receivedAnswer)) continue; + if(!iso14443a_select_card(NULL)) { + DbpString("iso14443a setup failed"); + break; } - // Transmit MIFARE_CLASSIC_AUTH - ReaderTransmit(mf_auth,sizeof(mf_auth)); + // Transmit MIFARE_CLASSIC_AUTH + ReaderTransmit(mf_auth,sizeof(mf_auth)); - // Receive the (16 bit) "random" nonce - if (!ReaderReceive(receivedAnswer)) continue; + // Receive the (16 bit) "random" nonce + if (!ReaderReceive(receivedAnswer)) continue; } - // Thats it... + // Thats it... FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); LEDsoff(); Dbprintf("%x %x %x", rsamples, 0xCC, 0xCC); @@ -1706,12 +1599,6 @@ void ReaderIso14443a(uint32_t parameter) //----------------------------------------------------------------------------- void ReaderMifare(uint32_t parameter) { - - // Anticollision - uint8_t wupa[] = { 0x52 }; - uint8_t sel_all[] = { 0x93,0x20 }; - uint8_t sel_uid[] = { 0x93,0x70,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; - // Mifare AUTH uint8_t mf_auth[] = { 0x60,0x00,0xf5,0x7b }; uint8_t mf_nr_ar[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }; @@ -1720,42 +1607,12 @@ void ReaderMifare(uint32_t parameter) traceLen = 0; tracing = false; - // Setup SSC - FpgaSetupSsc(); - - // 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); - FpgaSetupSsc(); - - // Now give it time to spin up. - // Signal field is on with the appropriate LED - LED_D_ON(); - FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD); - SpinDelay(200); + iso14443a_setup(); LED_A_ON(); LED_B_OFF(); LED_C_OFF(); - // Broadcast for a card, WUPA (0x52) will force response from all cards in the field - ReaderTransmitShort(wupa); - // Receive the ATQA - ReaderReceive(receivedAnswer); - // Transmit SELECT_ALL - ReaderTransmit(sel_all,sizeof(sel_all)); - // Receive the UID - ReaderReceive(receivedAnswer); - // Construct SELECT UID command - // First copy the 5 bytes (Mifare Classic) after the 93 70 - memcpy(sel_uid+2,receivedAnswer,5); - // Secondly compute the two CRC bytes at the end - AppendCrc14443a(sel_uid,7); - byte_t nt_diff = 0; LED_A_OFF(); byte_t par = 0; @@ -1776,28 +1633,12 @@ void ReaderMifare(uint32_t parameter) SpinDelay(200); FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_ISO14443A | FPGA_HF_ISO14443A_READER_MOD); - // Broadcast for a card, WUPA (0x52) will force response from all cards in the field - ReaderTransmitShort(wupa); - // Test if the action was cancelled if(BUTTON_PRESS()) { break; } - // Receive the ATQA - if (!ReaderReceive(receivedAnswer)) continue; - - // Transmit SELECT_ALL - ReaderTransmit(sel_all,sizeof(sel_all)); - - // Receive the UID - if (!ReaderReceive(receivedAnswer)) continue; - - // Transmit SELECT_UID - ReaderTransmit(sel_uid,sizeof(sel_uid)); - - // Receive the SAK - if (!ReaderReceive(receivedAnswer)) continue; + if(!iso14443a_select_card(NULL)) continue; // Transmit MIFARE_CLASSIC_AUTH ReaderTransmit(mf_auth,sizeof(mf_auth)); @@ -1843,10 +1684,9 @@ void ReaderMifare(uint32_t parameter) } } - LogTraceInfo(sel_uid+2,4); - LogTraceInfo(nt,4); - LogTraceInfo(par_list,8); - LogTraceInfo(ks_list,8); + LogTrace(nt,4,0,GetParity(nt,4),TRUE); + LogTrace(par_list,8,0,GetParity(par_list,8),TRUE); + LogTrace(ks_list,8,0,GetParity(ks_list,8),TRUE); // Thats it... FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);