]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/iso14443b.c
Separate WITH_LF and WITH_LF_StandAlone
[proxmark3-svn] / armsrc / iso14443b.c
index 31634a83bd6f8d63efa7c48bee20c5dfcb6ff5c0..75769859392c725453b4ede60ae9a5b3a60a3797 100644 (file)
@@ -19,6 +19,9 @@
 #define RECEIVE_SAMPLES_TIMEOUT 2000
 #define ISO14443B_DMA_BUFFER_SIZE 256
 
+// PCB Block number for APDUs
+static uint8_t pcb_blocknum = 0;
+
 //=============================================================================
 // An ISO 14443 Type B tag. We listen for commands from the reader, using
 // a UART kind of thing that's implemented in software. When we get a
@@ -240,7 +243,7 @@ static RAMFUNC int Handle14443bUartBit(uint8_t bit)
                                        LED_A_OFF(); // Finished receiving
                                        Uart.state = STATE_UNSYNCD;
                                        if (Uart.byteCnt != 0) {
-                                               return TRUE;
+                                               return true;
                                        }
                                } else {
                                        // this is an error
@@ -256,7 +259,7 @@ static RAMFUNC int Handle14443bUartBit(uint8_t bit)
                        break;
        }
 
-       return FALSE;
+       return false;
 }
 
 
@@ -280,7 +283,7 @@ static void UartInit(uint8_t *data)
 // Receive a command (from the reader to us, where we are the simulated tag),
 // and store it in the given buffer, up to the given maximum length. Keeps
 // spinning, waiting for a well-framed command, until either we get one
-// (returns TRUE) or someone presses the pushbutton on the board (FALSE).
+// (returns true) or someone presses the pushbutton on the board (false).
 //
 // Assume that we're called with the SSC (to the FPGA) and ADC path set
 // correctly.
@@ -299,20 +302,20 @@ static int GetIso14443bCommandFromReader(uint8_t *received, uint16_t *len)
        for(;;) {
                WDT_HIT();
 
-               if(BUTTON_PRESS()) return FALSE;
+               if(BUTTON_PRESS()) return false;
 
                if(AT91C_BASE_SSC->SSC_SR & (AT91C_SSC_RXRDY)) {
                        uint8_t b = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
                        for(uint8_t mask = 0x80; mask != 0x00; mask >>= 1) {
                                if(Handle14443bUartBit(b & mask)) {
                                        *len = Uart.byteCnt;
-                                       return TRUE;
+                                       return true;
                                }
                        }
                }
        }
-       
-       return FALSE;
+
+       return false;
 }
 
 //-----------------------------------------------------------------------------
@@ -344,7 +347,7 @@ void SimulateIso14443bTag(void)
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
 
        clear_trace();
-       set_tracing(TRUE);
+       set_tracing(true);
 
        const uint8_t *resp;
        uint8_t *respCode;
@@ -360,13 +363,13 @@ void SimulateIso14443bTag(void)
        // prepare the (only one) tag answer:
        CodeIso14443bAsTag(response1, sizeof(response1));
        uint8_t *resp1Code = BigBuf_malloc(ToSendMax);
-       memcpy(resp1Code, ToSend, ToSendMax); 
+       memcpy(resp1Code, ToSend, ToSendMax);
        uint16_t resp1CodeLen = ToSendMax;
 
        // prepare the (other) tag answer:
        CodeIso14443bAsTag(response2, sizeof(response2));
        uint8_t *resp2Code = BigBuf_malloc(ToSendMax);
-       memcpy(resp2Code, ToSend, ToSendMax); 
+       memcpy(resp2Code, ToSend, ToSendMax);
        uint16_t resp2CodeLen = ToSendMax;
 
        // We need to listen to the high-frequency, peak-detected path.
@@ -384,21 +387,21 @@ void SimulateIso14443bTag(void)
 
                if (tracing) {
                        uint8_t parity[MAX_PARITY_SIZE];
-                       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)
                        || (len == sizeof(cmd2) && memcmp(receivedCmd, cmd2, len) == 0) ) {
-                       resp = response1; 
+                       resp = response1;
                        respLen = sizeof(response1);
-                       respCode = resp1Code; 
+                       respCode = resp1Code;
                        respCodeLen = resp1CodeLen;
                } else if ( (len == sizeof(cmd3) && receivedCmd[0] == cmd3[0])
                        || (len == sizeof(cmd4) && receivedCmd[0] == cmd4[0]) ) {
-                       resp = response2; 
+                       resp = response2;
                        respLen = sizeof(response2);
-                       respCode = resp2Code; 
+                       respCode = resp2Code;
                        respCodeLen = resp2CodeLen;
                } else {
                        Dbprintf("new cmd from reader: len=%d, cmdsRecvd=%d", len, cmdsRecvd);
@@ -457,13 +460,13 @@ void SimulateIso14443bTag(void)
                                (void)b;
                        }
                }
-               
+
                // trace the response:
                if (tracing) {
                        uint8_t parity[MAX_PARITY_SIZE];
-                       LogTrace(resp, respLen, 0, 0, parity, FALSE);
+                       LogTrace(resp, respLen, 0, 0, parity, false);
                }
-                       
+
        }
 }
 
@@ -541,18 +544,23 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
                } else { \
                        v -= cq; \
                } \
-       }               
+       }
  */
 // Subcarrier amplitude v = sqrt(ci^2 + cq^2), approximated here by max(abs(ci),abs(cq)) + 1/2*min(abs(ci),abs(cq)))
+
+       //note: couldn't we just use MAX(ABS(ci),ABS(cq)) + (MIN(ABS(ci),ABS(cq))/2) from common.h - marshmellow
 #define CHECK_FOR_SUBCARRIER() { \
+               v = MAX(ABS(ci),ABS(cq)) + (MIN(ABS(ci),ABS(cq))/2); \
+       }
+               /*
                if(ci < 0) { \
-                       if(cq < 0) { /* ci < 0, cq < 0 */ \
+                       if(cq < 0) { \ // ci < 0, cq < 0
                                if (cq < ci) { \
                                        v = -cq - (ci >> 1); \
                                } else { \
                                        v = -ci - (cq >> 1); \
                                } \
-                       } else {        /* ci < 0, cq >= 0 */ \
+                       } else {        \ // ci < 0, cq >= 0
                                if (cq < -ci) { \
                                        v = -ci + (cq >> 1); \
                                } else { \
@@ -560,13 +568,13 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
                                } \
                        } \
                } else { \
-                       if(cq < 0) { /* ci >= 0, cq < 0 */ \
+                       if(cq < 0) { \ // ci >= 0, cq < 0
                                if (-cq < ci) { \
                                        v = ci - (cq >> 1); \
                                } else { \
                                        v = -cq + (ci >> 1); \
                                } \
-                       } else {        /* ci >= 0, cq >= 0 */ \
+                       } else {        \ // ci >= 0, cq >= 0
                                if (cq < ci) { \
                                        v = ci + (cq >> 1); \
                                } else { \
@@ -575,7 +583,8 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
                        } \
                } \
        }
-       
+               */
+
        switch(Demod.state) {
                case DEMOD_UNSYNCD:
                        CHECK_FOR_SUBCARRIER();
@@ -673,7 +682,7 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
                                        Demod.metric -= Demod.thisBit;
                                }
                                (Demod.metricN)++;
-*/                             
+*/
 
                                Demod.shiftReg >>= 1;
                                if(Demod.thisBit > 0) { // logic '1'
@@ -693,7 +702,7 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
                                                LED_C_OFF();
                                                if(s == 0x000) {
                                                        // This is EOF (start, stop and all data bits == '0'
-                                                       return TRUE;
+                                                       return true;
                                                }
                                        }
                                }
@@ -707,7 +716,7 @@ static RAMFUNC int Handle14443bSamplesDemod(int ci, int cq)
                        break;
        }
 
-       return FALSE;
+       return false;
 }
 
 
@@ -730,21 +739,21 @@ static void DemodInit(uint8_t *data)
 
 /*
  *  Demodulate the samples we received from the tag, also log to tracebuffer
- *  quiet: set to 'TRUE' to disable debug output
+ *  quiet: set to 'true' to disable debug output
  */
 static void GetSamplesFor14443bDemod(int n, bool quiet)
 {
        int max = 0;
-       bool gotFrame = FALSE;
+       bool gotFrame = false;
        int lastRxCounter, ci, cq, samples = 0;
 
        // Allocate memory from BigBuf for some buffers
        // free all previous allocations first
        BigBuf_free();
-       
+
        // The response (tag -> reader) that we're receiving.
        uint8_t *receivedResponse = BigBuf_malloc(MAX_FRAME_SIZE);
-       
+
        // The DMA buffer, used to stream samples from the FPGA
        int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
 
@@ -783,7 +792,7 @@ static void GetSamplesFor14443bDemod(int n, bool quiet)
                        samples += 2;
 
                        if(Handle14443bSamplesDemod(ci, cq)) {
-                               gotFrame = TRUE;
+                               gotFrame = true;
                                break;
                        }
                }
@@ -799,7 +808,7 @@ static void GetSamplesFor14443bDemod(int n, bool quiet)
        //Tracing
        if (tracing && Demod.len > 0) {
                uint8_t parity[MAX_PARITY_SIZE];
-               LogTrace(Demod.output, Demod.len, 0, 0, parity, FALSE);
+               LogTrace(Demod.output, Demod.len, 0, 0, parity, false);
        }
 }
 
@@ -920,10 +929,102 @@ static void CodeAndTransmit14443bAsReader(const uint8_t *cmd, int len)
        TransmitFor14443b();
        if (tracing) {
                uint8_t parity[MAX_PARITY_SIZE];
-               LogTrace(cmd,len, 0, 0, parity, TRUE);
+               LogTrace(cmd,len, 0, 0, parity, true);
        }
 }
 
+/* Sends an APDU to the tag
+ * TODO: check CRC and preamble
+ */
+int iso14443b_apdu(uint8_t const *message, size_t message_length, uint8_t *response)
+{
+       uint8_t message_frame[message_length + 4];
+       // PCB
+       message_frame[0] = 0x0A | pcb_blocknum;
+       pcb_blocknum ^= 1;
+       // CID
+       message_frame[1] = 0;
+       // INF
+       memcpy(message_frame + 2, message, message_length);
+       // EDC (CRC)
+       ComputeCrc14443(CRC_14443_B, message_frame, message_length + 2, &message_frame[message_length + 2], &message_frame[message_length + 3]);
+       // send
+       CodeAndTransmit14443bAsReader(message_frame, message_length + 4);
+       // get response
+       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT*100, true);
+       if(Demod.len < 3)
+       {
+               return 0;
+       }
+       // TODO: Check CRC
+       // copy response contents
+       if(response != NULL)
+       {
+               memcpy(response, Demod.output, Demod.len);
+       }
+       return Demod.len;
+}
+
+/* Perform the ISO 14443 B Card Selection procedure
+ * Currently does NOT do any collision handling.
+ * It expects 0-1 cards in the device's range.
+ * TODO: Support multiple cards (perform anticollision)
+ * TODO: Verify CRC checksums
+ */
+int iso14443b_select_card()
+{
+       // WUPB command (including CRC)
+       // Note: WUPB wakes up all tags, REQB doesn't wake up tags in HALT state
+       static const uint8_t wupb[] = { 0x05, 0x00, 0x08, 0x39, 0x73 };
+       // ATTRIB command (with space for CRC)
+       uint8_t attrib[] = { 0x1D, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00};
+
+       // first, wake up the tag
+       CodeAndTransmit14443bAsReader(wupb, sizeof(wupb));
+       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+       // ATQB too short?
+       if (Demod.len < 14)
+       {
+               return 2;
+       }
+
+    // select the tag
+    // copy the PUPI to ATTRIB
+    memcpy(attrib + 1, Demod.output + 1, 4);
+    /* copy the protocol info from ATQB (Protocol Info -> Protocol_Type) into
+    ATTRIB (Param 3) */
+    attrib[7] = Demod.output[10] & 0x0F;
+    ComputeCrc14443(CRC_14443_B, attrib, 9, attrib + 9, attrib + 10);
+    CodeAndTransmit14443bAsReader(attrib, sizeof(attrib));
+    GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
+    // Answer to ATTRIB too short?
+    if(Demod.len < 3)
+       {
+               return 2;
+       }
+       // reset PCB block number
+       pcb_blocknum = 0;
+       return 1;
+}
+
+// Set up ISO 14443 Type B communication (similar to iso14443a_setup)
+void iso14443b_setup() {
+       FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+       // Set up the synchronous serial port
+       FpgaSetupSsc();
+       // connect Demodulated Signal to ADC:
+       SetAdcMuxFor(GPIO_MUXSEL_HIPKD);
+
+       // Signal field is on with the appropriate LED
+    LED_D_ON();
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_HF_READER_TX | FPGA_HF_READER_TX_SHALLOW_MOD);
+
+       // Start the timer
+       StartCountSspClk();
+
+       DemodReset();
+       UartReset();
+}
 
 //-----------------------------------------------------------------------------
 // Read a SRI512 ISO 14443B tag.
@@ -955,12 +1056,12 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
        SpinDelay(200);
 
        clear_trace();
-       set_tracing(TRUE);
+       set_tracing(true);
 
        // First command: wake up the tag using the INITIATE command
        uint8_t cmd1[] = {0x06, 0x00, 0x97, 0x5b};
        CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
-       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
+       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
 
        if (Demod.len == 0) {
                DbpString("No response from tag");
@@ -976,7 +1077,7 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
        cmd1[1] = Demod.output[0];
        ComputeCrc14443(CRC_14443_B, cmd1, 2, &cmd1[2], &cmd1[3]);
        CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
-       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
+       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
        if (Demod.len != 3) {
                Dbprintf("Expected 3 bytes from tag, got %d", Demod.len);
                return;
@@ -998,7 +1099,7 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
        cmd1[0] = 0x0B;
        ComputeCrc14443(CRC_14443_B, cmd1, 1 , &cmd1[1], &cmd1[2]);
        CodeAndTransmit14443bAsReader(cmd1, 3); // Only first three bytes for this one
-       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
+       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
        if (Demod.len != 10) {
                Dbprintf("Expected 10 bytes from tag, got %d", Demod.len);
                return;
@@ -1027,7 +1128,7 @@ void ReadSTMemoryIso14443b(uint32_t dwLast)
                cmd1[1] = i;
                ComputeCrc14443(CRC_14443_B, cmd1, 2, &cmd1[2], &cmd1[3]);
                CodeAndTransmit14443bAsReader(cmd1, sizeof(cmd1));
-               GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
+               GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
                if (Demod.len != 6) { // Check if we got an answer from the tag
                        DbpString("Expected 6 bytes from tag, got less...");
                        return;
@@ -1073,13 +1174,13 @@ void RAMFUNC SnoopIso14443b(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;                   // TODO: set and evaluate trigger condition
+       int triggered = true;                   // TODO: set and evaluate trigger condition
 
        FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
        BigBuf_free();
 
        clear_trace();
-       set_tracing(TRUE);
+       set_tracing(true);
 
        // The DMA buffer, used to stream samples from the FPGA
        int8_t *dmaBuf = (int8_t*) BigBuf_malloc(ISO14443B_DMA_BUFFER_SIZE);
@@ -1116,9 +1217,9 @@ void RAMFUNC SnoopIso14443b(void)
        FpgaSetupSscDma((uint8_t*) dmaBuf, ISO14443B_DMA_BUFFER_SIZE);
        uint8_t parity[MAX_PARITY_SIZE];
 
-       bool TagIsActive = FALSE;
-       bool ReaderIsActive = FALSE;
-       
+       bool TagIsActive = false;
+       bool ReaderIsActive = false;
+
        // And now we loop, receiving samples.
        for(;;) {
                int behindBy = (lastRxCounter - AT91C_BASE_PDC_SSC->PDC_RCR) &
@@ -1158,7 +1259,7 @@ void RAMFUNC SnoopIso14443b(void)
                if (!TagIsActive) {                                                     // no need to try decoding reader data if the tag is sending
                        if(Handle14443bUartBit(ci & 0x01)) {
                                if(triggered && tracing) {
-                                       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();
@@ -1168,7 +1269,7 @@ void RAMFUNC SnoopIso14443b(void)
                        }
                        if(Handle14443bUartBit(cq & 0x01)) {
                                if(triggered && tracing) {
-                                       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();
@@ -1186,9 +1287,9 @@ void RAMFUNC SnoopIso14443b(void)
                                if(tracing)
                                {
                                        uint8_t parity[MAX_PARITY_SIZE];
-                                       LogTrace(Demod.output, Demod.len, samples, samples, parity, FALSE);
+                                       LogTrace(Demod.output, Demod.len, samples, samples, parity, false);
                                }
-                               triggered = TRUE;
+                               triggered = true;
 
                                // And ready to receive another response.
                                DemodReset();
@@ -1229,16 +1330,16 @@ void SendRawCommand14443B(uint32_t datalen, uint32_t recv, uint8_t powerfield, u
        FpgaSetupSsc();
 
        if (datalen){
-               set_tracing(TRUE);
+               set_tracing(true);
                
                CodeAndTransmit14443bAsReader(data, datalen);
 
                if(recv) {
-                       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, TRUE);
+                       GetSamplesFor14443bDemod(RECEIVE_SAMPLES_TIMEOUT, true);
                        uint16_t iLen = MIN(Demod.len, USB_CMD_DATA_SIZE);
                        cmd_send(CMD_ACK, iLen, 0, 0, Demod.output, iLen);
                }
-       } 
+       }
 
        if(!powerfield) {
                FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
Impressum, Datenschutz