CHG: some minor changes to the 14b, the read 14b lua,

[proxmark3-svn] / armsrc / iso14443b.c

diff --git a/armsrc/iso14443b.c b/armsrc/iso14443b.c
index 0528039944bb63f561ea2af8bd0756657e5d345a..a47f30179270e0bf551aa98023065cac288a2131 100644 (file)
--- a/armsrc/iso14443b.c
+++ b/armsrc/iso14443b.c
@@ -345,7 +345,7 @@ void SimulateIso14443bTag(void)
        // response to HLTB and ATTRIB
        static const uint8_t response2[] = {0x00, 0x78, 0xF0};
 
        // response to HLTB and ATTRIB
        static const uint8_t response2[] = {0x00, 0x78, 0xF0};
 

-       uint8_t parity[MAX_PARITY_SIZE];
+       uint8_t parity[MAX_PARITY_SIZE] = {0x00};

                                
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
                                
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 


@@ -383,14 +383,12 @@ void SimulateIso14443bTag(void)
 
        for(;;) {
 
 
        for(;;) {
 

-               if(!GetIso14443bCommandFromReader(receivedCmd, &len)) {
-               Dbprintf("button pressed, received %d commands", cmdsRecvd);
-               break;
+               if (!GetIso14443bCommandFromReader(receivedCmd, &len)) {
+                       Dbprintf("button pressed, received %d commands", cmdsRecvd);
+                       break;

                }
 
                }
 

-               if (tracing) {
-                       LogTrace(receivedCmd, len, 0, 0, parity, TRUE);
-               }
+               LogTrace(receivedCmd, len, 0, 0, parity, TRUE);

 
                // Good, look at the command now.
                if ( (len == sizeof(cmd1) && memcmp(receivedCmd, cmd1, len) == 0)
 
                // Good, look at the command now.
                if ( (len == sizeof(cmd1) && memcmp(receivedCmd, cmd1, len) == 0)


@@ -410,14 +408,14 @@ void SimulateIso14443bTag(void)
                        // And print whether the CRC fails, just for good measure
                        uint8_t b1, b2;
                        if (len >= 3){ // if crc exists
                        // And print whether the CRC fails, just for good measure
                        uint8_t b1, b2;
                        if (len >= 3){ // if crc exists

-                       ComputeCrc14443(CRC_14443_B, receivedCmd, len-2, &b1, &b2);
-                       if(b1 != receivedCmd[len-2] || b2 != receivedCmd[len-1]) {
-                               // Not so good, try again.
-                               DbpString("+++CRC fail");
-               
-                       } else {
-                               DbpString("CRC passes");
-                       }
+                               ComputeCrc14443(CRC_14443_B, receivedCmd, len-2, &b1, &b2);
+                               if(b1 != receivedCmd[len-2] || b2 != receivedCmd[len-1]) {
+                                       // Not so good, try again.
+                                       DbpString("+++CRC fail");
+                       
+                               } else {
+                                       DbpString("CRC passes");
+                               }

                        }
                        //get rid of compiler warning
                        respCodeLen = 0;
                        }
                        //get rid of compiler warning
                        respCodeLen = 0;


@@ -462,7 +460,7 @@ void SimulateIso14443bTag(void)
                                AT91C_BASE_SSC->SSC_THR = respCode[i++];
                                FpgaSendQueueDelay = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
                        }
                                AT91C_BASE_SSC->SSC_THR = respCode[i++];
                                FpgaSendQueueDelay = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
                        }

-                               if(BUTTON_PRESS()) break;
+                       if(BUTTON_PRESS()) break;

                }
                
                // Ensure that the FPGA Delay Queue is empty before we switch to TAGSIM_LISTEN again:
                }
                
                // Ensure that the FPGA Delay Queue is empty before we switch to TAGSIM_LISTEN again:


@@ -475,10 +473,10 @@ void SimulateIso14443bTag(void)
                        }
                }
                
                        }
                }
                

-               // trace the response:
-               if (tracing) LogTrace(resp, respLen, 0, 0, parity, FALSE);                      
+               LogTrace(resp, respLen, 0, 0, parity, FALSE);                   

        }
        FpgaDisableSscDma();
        }
        FpgaDisableSscDma();

+       set_tracing(FALSE);     

 }
 
 //=============================================================================
 }
 
 //=============================================================================


@@ -525,6 +523,7 @@ static struct {
  *          false if we are still waiting for some more
  *
  */
  *          false if we are still waiting for some more
  *
  */

+ #define abs(x) ( ((x)<0) ? -(x) : (x) )

 static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
 {
        int v = 0;
 static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
 {
        int v = 0;


@@ -779,11 +778,11 @@ static void GetSamplesFor14443bDemod(int n, bool quiet)
 
        AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;
 
 
        AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;
 

-       if (!quiet && Demod.len == 0) {
-               Dbprintf("max behindby = %d, samples = %d, gotFrame = %d, Demod.len = %d, Demod.sumI = %d, Demod.sumQ = %d",
+       if (!quiet) {
+               Dbprintf("max behindby = %d, samples = %d, gotFrame = %s, Demod.len = %d, Demod.sumI = %d, Demod.sumQ = %d",

                        max,
                        samples, 
                        max,
                        samples, 

-                       gotFrame, 
+                       (gotFrame) ? "true" : "false", 

                        Demod.len, 
                        Demod.sumI, 
                        Demod.sumQ
                        Demod.len, 
                        Demod.sumI, 
                        Demod.sumQ


@@ -791,8 +790,8 @@ static void GetSamplesFor14443bDemod(int n, bool quiet)
        }
 
        //Tracing
        }
 
        //Tracing

-       if (tracing && Demod.len > 0) {
-               uint8_t parity[MAX_PARITY_SIZE];
+       if (Demod.len > 0) {
+               uint8_t parity[MAX_PARITY_SIZE] = {0x00};

                LogTrace(Demod.output, Demod.len, 0, 0, parity, FALSE);
        }
 }
                LogTrace(Demod.output, Demod.len, 0, 0, parity, FALSE);
        }
 }


@@ -996,7 +995,7 @@ int iso14443b_select_card()
 void iso14443b_setup() {
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 void iso14443b_setup() {
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);

-
+       

        BigBuf_free();
        // Set up the synchronous serial port
        FpgaSetupSsc();
        BigBuf_free();
        // Set up the synchronous serial port
        FpgaSetupSsc();


@@ -1007,10 +1006,10 @@ void iso14443b_setup() {
     LED_D_ON();
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
        
     LED_D_ON();
        FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
        

-       SpinDelay(100);
+       //SpinDelay(100);

 
        // Start the timer
 
        // Start the timer

-       //StartCountSspClk();
+       StartCountSspClk();

 
        DemodReset();
        UartReset();
 
        DemodReset();
        UartReset();


@@ -1057,6 +1056,7 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
 
        if (Demod.len == 0) {
                DbpString("No response from tag");
 
        if (Demod.len == 0) {
                DbpString("No response from tag");

+               set_tracing(FALSE);     

                return;
        } else {
                Dbprintf("Randomly generated Chip ID (+ 2 byte CRC): %02x %02x %02x",
                return;
        } else {
                Dbprintf("Randomly generated Chip ID (+ 2 byte CRC): %02x %02x %02x",


@@ -1072,17 +1072,20 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
        GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
        if (Demod.len != 3) {
                Dbprintf("Expected 3 bytes from tag, got %d", Demod.len);
        GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
        if (Demod.len != 3) {
                Dbprintf("Expected 3 bytes from tag, got %d", Demod.len);

+               set_tracing(FALSE);     

                return;
        }
        // Check the CRC of the answer:
        ComputeCrc14443(CRC_14443_B, Demod.output, 1 , &cmd1[2], &cmd1[3]);
        if(cmd1[2] != Demod.output[1] || cmd1[3] != Demod.output[2]) {
                DbpString("CRC Error reading select response.");
                return;
        }
        // Check the CRC of the answer:
        ComputeCrc14443(CRC_14443_B, Demod.output, 1 , &cmd1[2], &cmd1[3]);
        if(cmd1[2] != Demod.output[1] || cmd1[3] != Demod.output[2]) {
                DbpString("CRC Error reading select response.");

+               set_tracing(FALSE);     

                return;
        }
        // Check response from the tag: should be the same UID as the command we just sent:
        if (cmd1[1] != Demod.output[0]) {
                Dbprintf("Bad response to SELECT from Tag, aborting: %02x %02x", cmd1[1], Demod.output[0]);
                return;
        }
        // Check response from the tag: should be the same UID as the command we just sent:
        if (cmd1[1] != Demod.output[0]) {
                Dbprintf("Bad response to SELECT from Tag, aborting: %02x %02x", cmd1[1], Demod.output[0]);

+               set_tracing(FALSE);     

                return;
        }
 
                return;
        }
 


@@ -1094,6 +1097,7 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
        GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
        if (Demod.len != 10) {
                Dbprintf("Expected 10 bytes from tag, got %d", Demod.len);
        GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
        if (Demod.len != 10) {
                Dbprintf("Expected 10 bytes from tag, got %d", Demod.len);

+               set_tracing(FALSE);     

                return;
        }
        // The check the CRC of the answer (use cmd1 as temporary variable):
                return;
        }
        // The check the CRC of the answer (use cmd1 as temporary variable):


@@ -1141,6 +1145,8 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
                }
                i++;
        }
                }
                i++;
        }

+       
+       set_tracing(FALSE);

 }
 
 
 }
 
 


@@ -1207,7 +1213,7 @@ void RAMFUNC SnoopIso14443b(void)
        upTo = dmaBuf;
        lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
        FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE);
        upTo = dmaBuf;
        lastRxCounter = ISO14443B_DMA_BUFFER_SIZE;
        FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE);

-       uint8_t parity[MAX_PARITY_SIZE];
+       uint8_t parity[MAX_PARITY_SIZE] = {0x00};

 
        bool TagIsActive = FALSE;
        bool ReaderIsActive = FALSE;
 
        bool TagIsActive = FALSE;
        bool ReaderIsActive = FALSE;


@@ -1236,10 +1242,12 @@ void RAMFUNC SnoopIso14443b(void)
                                Dbprintf("blew circular buffer! behindBy=%d", behindBy);
                                break;
                        }
                                Dbprintf("blew circular buffer! behindBy=%d", behindBy);
                                break;
                        }

+                       

                        if(!tracing) {
                        if(!tracing) {

-                               DbpString("Reached trace limit");
+                               DbpString("Trace full");

                                break;
                        }
                                break;
                        }

+                       

                        if(BUTTON_PRESS()) {
                                DbpString("cancelled");
                                break;
                        if(BUTTON_PRESS()) {
                                DbpString("cancelled");
                                break;


@@ -1249,51 +1257,48 @@ void RAMFUNC SnoopIso14443b(void)
                samples += 2;
 
                if (!TagIsActive) {                                                     // no need to try decoding reader data if the tag is sending
                samples += 2;
 
                if (!TagIsActive) {                                                     // no need to try decoding reader data if the tag is sending

-                       if(Handle14443bUartBit(ci & 0x01)) {
-                       if(triggered && tracing) {
+                       if (Handle14443bUartBit(ci & 0x01)) {
+                               if ( triggered)

                                        LogTrace(Uart.output, Uart.byteCnt, samples, samples, parity, TRUE);
                                        LogTrace(Uart.output, Uart.byteCnt, samples, samples, parity, TRUE);

+
+                               /* And ready to receive another command. */
+                               UartReset();
+                               /* And also reset the demod code, which might have been */
+                               /* false-triggered by the commands from the reader. */
+                               DemodReset();

                        }
                        }

-                       /* And ready to receive another command. */
-                       UartReset();
-                       /* And also reset the demod code, which might have been */
-                       /* false-triggered by the commands from the reader. */
-                       DemodReset();
-               }
-                       if(Handle14443bUartBit(cq & 0x01)) {
-                       if(triggered && tracing) {
+                       if (Handle14443bUartBit(cq & 0x01)) {
+                               if (triggered)

                                        LogTrace(Uart.output, Uart.byteCnt, samples, samples, parity, TRUE);
                                        LogTrace(Uart.output, Uart.byteCnt, samples, samples, parity, TRUE);

-                       }
-                       /* And ready to receive another command. */
-                       UartReset();
-                       /* And also reset the demod code, which might have been */
-                       /* false-triggered by the commands from the reader. */
-                       DemodReset();
-               }
+
+                                       /* And ready to receive another command. */
+                                       UartReset();
+                                       /* And also reset the demod code, which might have been */
+                                       /* false-triggered by the commands from the reader. */
+                                       DemodReset();
+                               }

                        ReaderIsActive = (Uart.state > STATE_GOT_FALLING_EDGE_OF_SOF);
                }
 
                if(!ReaderIsActive) {                                           // no need to try decoding tag data if the reader is sending - and we cannot afford the time
                        // is this | 0x01 the error?   & 0xfe  in https://github.com/Proxmark/proxmark3/issues/103
                        ReaderIsActive = (Uart.state > STATE_GOT_FALLING_EDGE_OF_SOF);
                }
 
                if(!ReaderIsActive) {                                           // no need to try decoding tag data if the reader is sending - and we cannot afford the time
                        // is this | 0x01 the error?   & 0xfe  in https://github.com/Proxmark/proxmark3/issues/103

-                       if(Handle14443bSamplesDemod(ci | 0x01, cq | 0x01)) {
+                       if(Handle14443bSamplesDemod(ci & 0xfe, cq & 0xfe)) {

 
 

-                       //Use samples as a time measurement
-                       if(tracing)
-                       {
-                               //uint8_t parity[MAX_PARITY_SIZE];
+                               //Use samples as a time measurement

                                LogTrace(Demod.output, Demod.len, samples, samples, parity, FALSE);
                                LogTrace(Demod.output, Demod.len, samples, samples, parity, FALSE);

-                       }
-                       triggered = TRUE;

 
 

-                       // And ready to receive another response.
-                       DemodReset();
-               }
+                               triggered = TRUE;
+
+                               // And ready to receive another response.
+                               DemodReset();
+                       }

                        TagIsActive = (Demod.state > DEMOD_GOT_FALLING_EDGE_OF_SOF);
                }
                        TagIsActive = (Demod.state > DEMOD_GOT_FALLING_EDGE_OF_SOF);
                }

-

        }
 
        FpgaDisableSscDma();
        LEDsoff();
        }
 
        FpgaDisableSscDma();
        LEDsoff();

+       

        AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;
        DbpString("Snoop statistics:");
        Dbprintf("  Max behind by: %i", maxBehindBy);
        AT91C_BASE_PDC_SSC->PDC_PTCR = AT91C_PDC_RXTDIS;
        DbpString("Snoop statistics:");
        Dbprintf("  Max behind by: %i", maxBehindBy);


@@ -1301,6 +1306,7 @@ void RAMFUNC SnoopIso14443b(void)
        Dbprintf("  Uart ByteCnt: %i", Uart.byteCnt);
        Dbprintf("  Uart ByteCntMax: %i", Uart.byteCntMax);
        Dbprintf("  Trace length: %i", BigBuf_get_traceLen());
        Dbprintf("  Uart ByteCnt: %i", Uart.byteCnt);
        Dbprintf("  Uart ByteCntMax: %i", Uart.byteCntMax);
        Dbprintf("  Trace length: %i", BigBuf_get_traceLen());

+       set_tracing(FALSE);     

 }
 
 
 }
 
 


@@ -1318,6 +1324,11 @@ void RAMFUNC SnoopIso14443b(void)
  */
 void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, uint8_t data[])
 {
  */
 void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, uint8_t data[])
 {

+       // param ISO_
+       // param ISO_CONNECT
+       // param ISO14A_NO_DISCONNECT
+       //if (param & ISO14A_NO_DISCONNECT)
+       // return;

        iso14443b_setup();
        
        if ( datalen == 0 && recv == 0 && powerfield == 0){
        iso14443b_setup();
        
        if ( datalen == 0 && recv == 0 && powerfield == 0){


@@ -1327,15 +1338,16 @@ void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, u
                CodeAndTransmit14443bAsReader(data, datalen);
        }
 
                CodeAndTransmit14443bAsReader(data, datalen);
        }
 

-       if(recv) {
+       if (recv) {

                GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, FALSE);
                uint16_t iLen = MIN(Demod.len, USB_CMD_DATA_SIZE);
                cmd_send(CMD_ACK, iLen, 0, 0, Demod.output, iLen);
        }
        
                GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, FALSE);
                uint16_t iLen = MIN(Demod.len, USB_CMD_DATA_SIZE);
                cmd_send(CMD_ACK, iLen, 0, 0, Demod.output, iLen);
        }
        

-       if(!powerfield) {
+       if (!powerfield) {

                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                FpgaDisableSscDma();
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
                FpgaDisableSscDma();

+               set_tracing(FALSE);

                LED_D_OFF();
        }
 }
                LED_D_OFF();
        }
 }