FIX: decrease 2^39 -> 2^38. its a big searchspace anyway.

[proxmark3-svn] / client / cmdhf.c

diff --git a/client/cmdhf.c b/client/cmdhf.c
index b240878277a841205a6e0f1e7e7e13e5d427b55e..031f065ea99c35b0b463c40dfd057426789720fe 100644 (file)
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -372,6 +372,7 @@ void annotateIso14443b(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize) {
 // Quite simpel tag
 void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){     
        uint8_t bitsend = cmd[0];       
+       uint8_t cmdBit = (cmd[1] & 1);
        switch (bitsend){
                case 7:
                        snprintf(exp, size, "IV 0x%02X", cmd[1]);
@@ -388,8 +389,8 @@ void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
                }
                case 9:
                case 11: {
-                       uint8_t cmdBit = (cmd[1] & 1);
-                       uint8_t address = (cmd[2] << 7) | cmd[1] >> 1;
+
+                       uint16_t address = (cmd[2] << 7) | cmd[1] >> 1;
                        
                        if (cmdBit == LEGIC_READ) 
                                snprintf(exp, size, "READ Byte(%d)", address);
@@ -398,6 +399,22 @@ void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){
                                snprintf(exp, size, "WRITE Byte(%d)", address);
                        break;
                }
+               case 21: {
+                       if (cmdBit == LEGIC_WRITE ) {
+                               uint16_t address = ((cmd[2] << 7) | cmd[1] >> 1) & 0xFF;
+                               uint8_t val = (cmd[3] & 1 ) << 7 | cmd[2] >> 1;
+                               snprintf(exp, size, "WRITE Byte(%d) %02X", address, val);
+                       }
+                       break;
+               }
+               case 23: {
+                       if (cmdBit == LEGIC_WRITE ) {
+                               uint16_t address = ((cmd[2] << 7) | cmd[1] >> 1) & 0x3FF;
+                               uint8_t val = (cmd[3] & 0x7 ) << 5 | cmd[2] >> 3;
+                               snprintf(exp, size, "WRITE Byte(%d) %02X", address, val);
+                       }
+                       break;
+               }
                case 12:
                default:
                        break;
@@ -515,20 +532,6 @@ uint8_t iclass_CRC_check(bool isResponse, uint8_t* data, uint8_t len)
        }
 }
 
-uint8_t legic_CRC_check(bool isResponse, uint8_t* data, uint8_t len){
-       if (len > 2) return 2;
-       
-       uint8_t calccrc = CRC8Legic(data, len);
-       
-       return 0;
-       // crc_init(&legic_crc, 4, 0x19 >> 1, 0x5, 0);
-       // crc_clear(&legic_crc);
-       // crc_update(&legic_crc, 1, 1); /* CMD_READ */
-       // crc_update(&legic_crc, byte_index, cmd_sz-1);
-       // crc_update(&legic_crc, value, 8);
-       // return crc_finish(&legic_crc);
-}
-
 bool is_last_record(uint16_t tracepos, uint8_t *trace, uint16_t traceLen)
 {
        return(tracepos + sizeof(uint32_t) + sizeof(uint16_t) + sizeof(uint16_t) >= traceLen);
@@ -645,8 +648,6 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                        default: 
                                break;
                }
-       } else if ( data_len == 2 && protocol == LEGIC ){
-               crcStatus = legic_CRC_check(isResponse, frame, data_len);               
        }
        //0 CRC-command, CRC not ok
        //1 CRC-command, CRC ok
@@ -664,7 +665,7 @@ uint16_t printTraceLine(uint16_t tracepos, uint16_t traceLen, uint8_t *trace, ui
                        oddparity ^= (((frame[j] & 0xFF) >> k) & 0x01);
                }
                uint8_t parityBits = parityBytes[j>>3];
-               if (protocol != ISO_14443B && protocol != ISO_7816_4 &&  (isResponse || protocol == ISO_14443A)  && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
+               if (protocol != LEGIC && protocol != ISO_14443B && protocol != ISO_7816_4 &&  (isResponse || protocol == ISO_14443A)  && (oddparity != ((parityBits >> (7-(j&0x0007))) & 0x01))) {
                        snprintf(line[j/16]+(( j % 16) * 4),110, "%02x! ", frame[j]);
                } else {
                        snprintf(line[j/16]+(( j % 16) * 4),110, "%02x  ", frame[j]);
@@ -848,8 +849,12 @@ int CmdHFList(const char *Cmd) {
        PrintAndLog("Recorded Activity (TraceLen = %d bytes)", traceLen);
        PrintAndLog("");
        PrintAndLog("Start = Start of Start Bit, End = End of last modulation. Src = Source of Transfer");
-       PrintAndLog("iso14443a - All times are in carrier periods (1/13.56Mhz)");
-       PrintAndLog("iClass    - Timings are not as accurate");
+       if ( protocol == ISO_14443A )
+               PrintAndLog("iso14443a - All times are in carrier periods (1/13.56Mhz)");
+       if ( protocol == ICLASS )
+               PrintAndLog("iClass    - Timings are not as accurate");
+       if ( protocol == LEGIC )
+               PrintAndLog("LEGIC    - Timings are in ticks (1us == 1.5ticks)");
        PrintAndLog("");
     PrintAndLog("      Start |        End | Src | Data (! denotes parity error)                                   | CRC | Annotation         |");
        PrintAndLog("------------|------------|-----|-----------------------------------------------------------------|-----|--------------------|");
@@ -869,35 +874,34 @@ int CmdHFSearch(const char *Cmd){
        
        PrintAndLog("");
        int ans = CmdHF14AReader("s");
-
        if (ans > 0) {
                PrintAndLog("\nValid ISO14443-A Tag Found - Quiting Search\n");
                return ans;
        } 
-       ans = CmdHF14BReader("s");
+       ans = HF14BReader(false); //CmdHF14BReader("s");
        if (ans) {
                PrintAndLog("\nValid ISO14443-B Tag Found - Quiting Search\n");
                return ans;
        }
-       ans = HFiClassReader("", false, false);
-       if (ans) {
-               PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
-               return ans;
-       }
        ans = HF15Reader("", false);
        if (ans) {
                PrintAndLog("\nValid ISO15693 Tag Found - Quiting Search\n");
                return ans;
        }
+       ans = HFLegicReader("", false);
+       if ( ans == 0) {
+               PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
+               return 1;
+       }
        ans = CmdHFTopazReader("s");
        if (ans == 0) {
                PrintAndLog("\nValid Topaz Tag Found - Quiting Search\n");
                return 1;
        }
-       ans = HFLegicInfo("", false);
-       if ( ans == 0) {
-               PrintAndLog("\nValid LEGIC Tag Found - Quiting Search\n");
-               return 1;
+       ans = HFiClassReader("", false, false);
+       if (ans) {
+               PrintAndLog("\nValid iClass Tag (or PicoPass Tag) Found - Quiting Search\n");
+               return ans;
        }
        
        PrintAndLog("\nno known/supported 13.56 MHz tags found\n");