]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - armsrc/legicrf.c
CHG: a select_legic function with structs and stuff and
[proxmark3-svn] / armsrc / legicrf.c
index b1378b811e1ac99e4702f4c53d7058c6bc76ac0c..ca56b2356d3e02dfc2327006439260135d8e7d57 100644 (file)
@@ -10,7 +10,7 @@
 #include "legicrf.h"
 
 static struct legic_frame {
-       int bits;
+       uint8_t bits;
        uint32_t data;
 } current_frame;
 
@@ -68,15 +68,11 @@ static void setup_timer(void) {
 */
 
 // At TIMER_CLOCK3 (MCK/32)
-//#define RWD_TIME_1 150     /* RWD_TIME_PAUSE off, 80us on = 100us */
-//#define RWD_TIME_0 90      /* RWD_TIME_PAUSE off, 40us on = 60us */
-//#define RWD_TIME_PAUSE 30  /* 20us */
-
 // testing calculating in (us) microseconds.
 #define        RWD_TIME_1 120          // READER_TIME_PAUSE 20us off, 80us on = 100us  80 * 1.5 == 120ticks
 #define RWD_TIME_0 60          // READER_TIME_PAUSE 20us off, 40us on = 60us   40 * 1.5 == 60ticks 
 #define RWD_TIME_PAUSE 30      // 20us == 20 * 1.5 == 30ticks */
-#define TAG_BIT_PERIOD 150     // 100us == 100 * 1.5 == 150ticks
+#define TAG_BIT_PERIOD 143     // 100us == 100 * 1.5 == 150ticks
 #define TAG_FRAME_WAIT 495  // 330us from READER frame end to TAG frame start. 330 * 1.5 == 495
 
 #define RWD_TIME_FUZZ 20   // rather generous 13us, since the peak detector + hysteresis fuzz quite a bit
@@ -116,7 +112,7 @@ uint32_t sendFrameStop = 0;
 #define LEGIC_CARD_MEMSIZE 1024
 static uint8_t* cardmem;
 
-static void frame_append_bit(struct legic_frame * const f, int bit) {
+static void frame_append_bit(struct legic_frame * const f, uint8_t bit) {
        // Overflow, won't happen
    if (f->bits >= 31) return;
   
@@ -225,7 +221,7 @@ void frame_sendAsReader(uint32_t data, uint8_t bits){
 
        uint32_t starttime = GET_TICKS, send = 0;
        uint16_t mask = 1;
-       uint8_t prng1 = legic_prng_count() ;
+       uint8_t prngstart = legic_prng_count() ;
        
        // xor lsfr onto data.
        send = data ^ legic_prng_get_bits(bits);
@@ -243,10 +239,12 @@ void frame_sendAsReader(uint32_t data, uint8_t bits){
        
        sendFrameStop = GET_TICKS;
        uint8_t cmdbytes[] = {
+               bits,
                BYTEx(data, 0), 
                BYTEx(data, 1),
-               bits,
-               prng1,
+               BYTEx(send, 0), 
+               BYTEx(send, 1),
+               prngstart,
                legic_prng_count()
        };
        LogTrace(cmdbytes, sizeof(cmdbytes), starttime, sendFrameStop, NULL, TRUE);
@@ -280,33 +278,36 @@ static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {
        
        uint8_t i = bits, edges = 0;    
        uint16_t lsfr = 0;
-       uint32_t the_bit = 1, next_bit_at = 0, data;
+       uint32_t the_bit = 1, next_bit_at = 0, data = 0;
        
        int old_level = 0, level = 0;
        
        AT91C_BASE_PIOA->PIO_ODR = GPIO_SSC_DIN;
        AT91C_BASE_PIOA->PIO_PER = GPIO_SSC_DIN;
        
-       // calibrate the prng.  
+       // calibrate the prng.
        legic_prng_forward(2);
-       
-       // precompute the cipher
-       uint8_t prng_before =  legic_prng_count() ;
-
-       lsfr = legic_prng_get_bits(bits);
-
-       data = lsfr;
+       uint8_t prngstart =  legic_prng_count() ;
+       data = lsfr = legic_prng_get_bits(bits);
        
        //FIXED time between sending frame and now listening frame. 330us
-       //WaitTicks( TAG_FRAME_WAIT - (GET_TICKS - sendFrameStop ) );
-       WaitTicks( 495 );
-
+       // 387 = 0x19  0001 1001
        uint32_t starttime = GET_TICKS;
+       //uint16_t mywait =  TAG_FRAME_WAIT - (starttime - sendFrameStop);
+       //uint16_t mywait =  495 - (starttime - sendFrameStop);
+       if ( bits == 6) {
+               //WaitTicks( 495 - 9 - 9 );
+               WaitTicks( 475 );
+       } else {
+               //Dbprintf("x WAIT %d", mywait );
+               //WaitTicks( mywait );
+               WaitTicks( 450 );
+       }
+
        next_bit_at =  GET_TICKS + TAG_BIT_PERIOD;
 
        while ( i-- ){
                edges = 0;
-               uint8_t adjust = 0;
                while  ( GET_TICKS < next_bit_at) {
 
                        level = (AT91C_BASE_PIOA->PIO_PDSR & GPIO_SSC_DIN);
@@ -315,17 +316,13 @@ static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {
                                ++edges;
                        
                        old_level = level;
-                       
-                       if(edges > 20 && adjust == 0) {
-                               next_bit_at -= 15;
-                               adjust = 1;
-                       }
                }               
 
                next_bit_at += TAG_BIT_PERIOD;
                
                // We expect 42 edges  == ONE
-               if(edges > 20 && edges < 64)
+               //if (edges > 20 && edges < 64)
+               if ( edges > 20 )
                        data ^= the_bit;
 
                the_bit <<= 1;  
@@ -334,22 +331,17 @@ static void frame_receiveAsReader(struct legic_frame * const f, uint8_t bits) {
        // output
        f->data = data;
        f->bits = bits;
-               
-       // log
-       sendFrameStop = GET_TICKS;
        
-       uint8_t cmdbytes[] = { 
-               BYTEx(data,0),
-               BYTEx(data,1),
+       uint8_t cmdbytes[] = {
                bits,
-               BYTEx(lsfr,0),
-               BYTEx(lsfr,1),
-               BYTEx(data, 0) ^ BYTEx(lsfr,0),
-               BYTEx(data, 1) ^ BYTEx(lsfr,1),
-               prng_before,
+               BYTEx(data, 0),
+               BYTEx(data, 1),
+               BYTEx(data, 0) ^ BYTEx(lsfr, 0),
+               BYTEx(data, 1) ^ BYTEx(lsfr, 1),
+               prngstart,
                legic_prng_count()
        };
-       LogTrace(cmdbytes, sizeof(cmdbytes), starttime, sendFrameStop, NULL, FALSE);
+       LogTrace(cmdbytes, sizeof(cmdbytes), starttime, GET_TICKS, NULL, FALSE);
 }
 
 // Setup pm3 as a Legic Reader
@@ -372,9 +364,10 @@ static uint32_t setup_phase_reader(uint8_t iv) {
 
        frame_receiveAsReader(&current_frame, 6);
 
-       // fixed delay before sending ack.
-       WaitTicks(366);  // 244us
-       legic_prng_forward(1);  //240us / 100 == 2.4 iterations
+       // 292us (438t) - fixed delay before sending ack.
+       // minus log and stuff 100tick?
+       WaitTicks(338);
+       legic_prng_forward(3); 
        
        // Send obsfuscated acknowledgment frame.
        // 0x19 = 0x18 MIM22, 0x01 LSB READCMD 
@@ -385,6 +378,8 @@ static uint32_t setup_phase_reader(uint8_t iv) {
                case 0x3D: frame_sendAsReader(0x39, 6); break;
                default: break;
        }
+
+       legic_prng_forward(2);
        return current_frame.data;
 }
 
@@ -413,9 +408,8 @@ static void LegicCommonInit(void) {
 // Switch off carrier, make sure tag is reset
 static void switch_off_tag_rwd(void) {
        LOW(GPIO_SSC_DOUT);
-       WaitUS(200);
+       WaitUS(20);
        WDT_HIT();
-       Dbprintf("Exit Switch_off_tag_rwd");
 }
 
 // calculate crc4 for a legic READ command 
@@ -432,32 +426,30 @@ static uint32_t legic4Crc(uint8_t legicCmd, uint16_t byte_index, uint8_t value,
 
 int legic_read_byte(int byte_index, int cmd_sz) {
 
+       uint8_t byte = 0; //, crc = 0, calcCrc = 0;
+       uint32_t cmd = (byte_index << 1) | LEGIC_READ;
+       
        // (us)| ticks
        // -------------
        // 330 | 495
-       // 460 | 690
-       // 258 | 387
        // 244 | 366
        WaitTicks(366); 
-       legic_prng_forward(3); // 460 / 100 = 4.6  iterations
-
-       uint8_t byte = 0, crc = 0, calcCrc = 0;
-       uint32_t cmd = (byte_index << 1) | LEGIC_READ;
-
+       
        frame_sendAsReader(cmd, cmd_sz);
        frame_receiveAsReader(&current_frame, 12);
 
        byte = BYTEx(current_frame.data, 0);
-       calcCrc = legic4Crc(LEGIC_READ, byte_index, byte, cmd_sz);
-       crc = BYTEx(current_frame.data, 1);
 
-       if( calcCrc != crc ) {
-               Dbprintf("!!! crc mismatch: expected %x but got %x !!!",  calcCrc, crc);
-               return -1;
-       }
+       // calcCrc = legic4Crc(LEGIC_READ, byte_index, byte, cmd_sz);
+       // crc = BYTEx(current_frame.data, 1);
 
+       // if( calcCrc != crc ) {
+               // Dbprintf("!!! crc mismatch: expected %x but got %x !!!",  calcCrc, crc);
+               // return -1;
+       // }
 
-//     legic_prng_forward(2); // 460 / 100 = 4.6  iterations
+       legic_prng_forward(4);
+       WaitTicks(40);
        return byte;
 }
 
@@ -534,66 +526,42 @@ int legic_write_byte(uint8_t byte, uint16_t addr, uint8_t addr_sz) {
 int LegicRfReader(int offset, int bytes, int iv) {
        
        uint16_t byte_index = 0;
-       uint8_t cmd_sz = 0;
-       int card_sz = 0;                                                                   
        uint8_t isOK = 1;
-       
-       if ( MF_DBGLEVEL >= 2)
-               Dbprintf("setting up legic card,  IV = 0x%02x", iv);
+       legic_card_select_t card;
        
        LegicCommonInit();
-
-       uint32_t tag_type = setup_phase_reader(iv);
-
-        //we lose to mutch time with dprintf
-       switch_off_tag_rwd();
        
-       switch(tag_type) {
-               case 0x0d:
-                       if ( MF_DBGLEVEL >= 2) DbpString("MIM22 card found, reading card");
-            cmd_sz = 6;
-                       card_sz = 22;
-                       break;
-               case 0x1d:
-                       if ( MF_DBGLEVEL >= 2) DbpString("MIM256 card found, reading card");
-            cmd_sz = 9;
-                       card_sz = 256;
-                       break;
-               case 0x3d:
-                       if ( MF_DBGLEVEL >= 2) DbpString("MIM1024 card found, reading card");
-            cmd_sz = 11;
-                       card_sz = 1024;
-                       break;
-               default:
-                       if ( MF_DBGLEVEL >= 1) Dbprintf("Unknown card format: %x", tag_type);
-                       isOK = 0;
-                       goto OUT;
-                       break;
+       if ( legic_select_card(&card) ) {
+               isOK = 0;
+               goto OUT;
        }
+               
+       switch_off_tag_rwd();
+       
        if (bytes == -1)
-               bytes = card_sz;
+               bytes = card.cardsize;
 
-       if (bytes + offset >= card_sz)
-               bytes = card_sz - offset;
+       if (bytes + offset >= card.cardsize)
+               bytes = card.cardsize - offset;
 
        // Start setup and read bytes.
        setup_phase_reader(iv);
-       
+               
        LED_B_ON();
        while (byte_index < bytes) {
-               int r = legic_read_byte(byte_index + offset, cmd_sz);
+               int r = legic_read_byte(byte_index + offset, card.cmdsize);
                
                if (r == -1 || BUTTON_PRESS()) {                        
-               if ( MF_DBGLEVEL >= 2) DbpString("operation aborted");
+               if ( MF_DBGLEVEL >= 3) DbpString("operation aborted");
                        isOK = 0;
                        goto OUT;
                }
-               cardmem[++byte_index] = r;
-               //byte_index++;
+               cardmem[byte_index++] = r;
         WDT_HIT();
        }
 
 OUT:   
+       WDT_HIT();
        switch_off_tag_rwd();
        LEDsoff();
        uint8_t len = (bytes & 0x3FF);
@@ -778,6 +746,63 @@ void LegicRfRawWriter(int address, int byte, int iv) {
     if ( MF_DBGLEVEL >= 1) DbpString("write successful");
 }
 
+int legic_select_card(legic_card_select_t *p_card){
+
+       if ( p_card == NULL ) return 1;
+       
+       p_card->tagtype = setup_phase_reader(0x1);
+       
+       switch(p_card->tagtype) {
+               case 0x0d:
+            p_card->cmdsize = 6;
+                       p_card->cardsize = 22;
+                       break;
+               case 0x1d:
+                       p_card->cmdsize = 9;
+                       p_card->cardsize = 256;
+                       break;
+               case 0x3d:
+            p_card->cmdsize = 11;
+                       p_card->cardsize = 1024;
+                       break;
+               default: 
+                   p_card->cmdsize = 0;
+                       p_card->cardsize = 0;
+                       return 2;
+                       break;
+       }
+       return 0;
+}
+
+void LegicRfInfo(void){
+
+       uint8_t buf[sizeof(legic_card_select_t)] = {0x00};
+       legic_card_select_t *card = (legic_card_select_t*) buf;
+       
+       LegicCommonInit();
+       
+       if ( legic_select_card(card) ) {
+               cmd_send(CMD_ACK,0,0,0,0,0);
+               goto OUT;
+       }
+
+       // read UID bytes.
+       for ( uint8_t i = 0; i < sizeof(card->uid); ++i) {
+               int r = legic_read_byte(i, card->cmdsize);
+               if ( r == -1 ) {
+                       cmd_send(CMD_ACK,0,0,0,0,0);
+                       goto OUT;
+               }
+               card->uid[i] = r & 0xFF;
+       }
+
+       cmd_send(CMD_ACK, 1 ,0 , 0, buf, sizeof(legic_card_select_t));
+       
+OUT:
+       switch_off_tag_rwd();
+       LEDsoff();
+}
+
 /* Handle (whether to respond) a frame in tag mode
  * Only called when simulating a tag.
  */
@@ -1084,6 +1109,7 @@ void LegicRfSimulate(int phase, int frame, int reqresp)
 // The software UART that receives commands from the reader, and its state
 // variables.
 //-----------------------------------------------------------------------------
+/*
 static struct {
        enum {
                STATE_UNSYNCD,
@@ -1098,7 +1124,7 @@ static struct {
        int     posCnt;
        uint8_t *output;
 } Uart;
-
+*/
 /* Receive & handle a bit coming from the reader.
  *
  * This function is called 4 times per bit (every 2 subcarrier cycles).
@@ -1223,7 +1249,7 @@ static struct {
 
        // return FALSE;
 // }
-
+/*
 
 static void UartReset() {
        Uart.byteCntMax = 3;
@@ -1233,7 +1259,7 @@ static void UartReset() {
        Uart.posCnt = 0;
        memset(Uart.output, 0x00, 3);
 }
-
+*/
 // static void UartInit(uint8_t *data) {
        // Uart.output = data;
        // UartReset();
@@ -1245,7 +1271,7 @@ static void UartReset() {
 // tag's response, which we leave in the buffer to be demodulated on the
 // PC side.
 //=============================================================================
-
+/*
 static struct {
        enum {
                DEMOD_UNSYNCD,
@@ -1264,7 +1290,7 @@ static struct {
        int     sumI;
        int     sumQ;
 } Demod;
-
+*/
 /*
  * Handles reception of a bit from the tag
  *
@@ -1279,32 +1305,8 @@ static struct {
  *          false if we are still waiting for some more
  *
  */
-
- #ifndef SUBCARRIER_DETECT_THRESHOLD
- # define SUBCARRIER_DETECT_THRESHOLD  8
- #endif
  
- // Subcarrier amplitude v = sqrt(ci^2 + cq^2), approximated here by max(abs(ci),abs(cq)) + 1/2*min(abs(ci),abs(cq)))
-#ifndef CHECK_FOR_SUBCARRIER
-# define CHECK_FOR_SUBCARRIER() { v = MAX(ai, aq) + MIN(halfci, halfcq); }
-#endif
-
-// The soft decision on the bit uses an estimate of just the
-// quadrant of the reference angle, not the exact angle.
-// Subcarrier amplitude v = sqrt(ci^2 + cq^2), approximated here by max(abs(ci),abs(cq)) + 1/2*min(abs(ci),abs(cq)))
-#define MAKE_SOFT_DECISION() { \
-               if(Demod.sumI > 0) \
-                       v = ci; \
-               else \
-                       v = -ci; \
-               \
-               if(Demod.sumQ > 0) \
-                       v += cq; \
-               else \
-                       v -= cq; \
-               \
-       }
-
+/*
 static RAMFUNC int HandleLegicSamplesDemod(int ci, int cq)
 {
        int v = 0;
@@ -1459,7 +1461,8 @@ static RAMFUNC int HandleLegicSamplesDemod(int ci, int cq)
        }
        return FALSE;
 }
-
+*/
+/*
 // Clear out the state of the "UART" that receives from the tag.
 static void DemodReset() {
        Demod.len = 0;
@@ -1477,13 +1480,17 @@ static void DemodInit(uint8_t *data) {
        Demod.output = data;
        DemodReset();
 }
+*/
 
 /*
  *  Demodulate the samples we received from the tag, also log to tracebuffer
  *  quiet: set to 'TRUE' to disable debug output
  */
+ /*
  #define LEGIC_DMA_BUFFER_SIZE 256
-static void GetSamplesForLegicDemod(int n, bool quiet)
+
+ static void GetSamplesForLegicDemod(int n, bool quiet)
 {
        int max = 0;
        bool gotFrame = FALSE;
@@ -1558,9 +1565,13 @@ static void GetSamplesForLegicDemod(int n, bool quiet)
                LogTrace(Demod.output, Demod.len, 0, 0, parity, FALSE);
        }
 }
+
+*/
+
 //-----------------------------------------------------------------------------
 // Transmit the command (to the tag) that was placed in ToSend[].
 //-----------------------------------------------------------------------------
+/*
 static void TransmitForLegic(void)
 {
        int c;
@@ -1607,12 +1618,13 @@ static void TransmitForLegic(void)
        }
        LED_B_OFF();
 }
-
+*/
 
 //-----------------------------------------------------------------------------
 // Code a layer 2 command (string of octets, including CRC) into ToSend[],
 // so that it is ready to transmit to the tag using TransmitForLegic().
 //-----------------------------------------------------------------------------
+/*
 static void CodeLegicBitsAsReader(const uint8_t *cmd, uint8_t cmdlen, int bits)
 {
        int i, j;
@@ -1644,11 +1656,12 @@ static void CodeLegicBitsAsReader(const uint8_t *cmd, uint8_t cmdlen, int bits)
        // Convert from last character reference to length
        ++ToSendMax;
 }
-
+*/
 /**
   Convenience function to encode, transmit and trace Legic comms
   **/
-static void CodeAndTransmitLegicAsReader(const uint8_t *cmd, uint8_t cmdlen, int bits)
+/*
+  static void CodeAndTransmitLegicAsReader(const uint8_t *cmd, uint8_t cmdlen, int bits)
 {
        CodeLegicBitsAsReader(cmd, cmdlen, bits);
        TransmitForLegic();
@@ -1658,58 +1671,9 @@ static void CodeAndTransmitLegicAsReader(const uint8_t *cmd, uint8_t cmdlen, int
        }
 }
 
-int ice_legic_select_card()
-{
-       //int cmd_size=0, card_size=0;
-       uint8_t wakeup[] = { 0x7F };
-       uint8_t getid[] = {0x19};
-
-       //legic_prng_init(SESSION_IV);
-
-       // first, wake up the tag, 7bits
-       CodeAndTransmitLegicAsReader(wakeup, sizeof(wakeup), 7);
-
-       GetSamplesForLegicDemod(1000, TRUE);
-
-       //frame_receiveAsReader(&current_frame, 6, 1);
-
-       legic_prng_forward(1); /* we wait anyways */
-       
-       //while(timer->TC_CV < 387) ; /* ~ 258us */
-       //frame_sendAsReader(0x19, 6);
-       CodeAndTransmitLegicAsReader(getid, sizeof(getid), 8);
-       GetSamplesForLegicDemod(1000, TRUE);
-
-       //if (Demod.len < 14) return 2; 
-       Dbprintf("CARD TYPE: %02x  LEN: %d", Demod.output[0], Demod.len);
-
-       switch(Demod.output[0]) {
-               case 0x1d:
-                       DbpString("MIM 256 card found");
-            // cmd_size = 9;
-                       // card_size = 256;
-                       break;
-               case 0x3d:
-                       DbpString("MIM 1024 card found");
-            // cmd_size = 11;
-                       // card_size = 1024;
-                       break;
-               default:
-                       return -1;
-       }
-       
-       // if(bytes == -1)
-               // bytes = card_size;
-
-       // if(bytes + offset >= card_size)
-               // bytes = card_size - offset;  
-       
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-       set_tracing(FALSE);
-       return 1;
-}
-
+*/
 // Set up LEGIC communication
+/*
 void ice_legic_setup() {
 
        // standard things.
@@ -1738,4 +1702,5 @@ void ice_legic_setup() {
 
        // initalize prng
        legic_prng_init(0);
-}
\ No newline at end of file
+}
+*/
\ No newline at end of file
Impressum, Datenschutz