]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/cmdhflegic.c
ADD: started to add a legic detection to "HF SEARCH"
[proxmark3-svn] / client / cmdhflegic.c
index 39c64921fe509f62bd6eb0427aaddf6d45e71cfe..2200a15b9b69af8fabe12a469801d0f3584d23c0 100644 (file)
@@ -47,7 +47,7 @@ int usage_legic_read(void){
        PrintAndLog("  h             : this help");
        PrintAndLog("  <offset>      : offset in data array to start download from");
        PrintAndLog("  <length>      : number of bytes to download");
-       PrintAndLog("  <IV>          : (optional) Initialization vector to use");
+       PrintAndLog("  <IV>          : (optional) Initialization vector to use (ODD and 7bits)");
        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("      hf legic read");
@@ -65,7 +65,7 @@ int usage_legic_write(void){
        PrintAndLog("  h             : this help");
        PrintAndLog("  <offset>      : offset in data array to start writing from");
        PrintAndLog("  <length>      : number of bytes to write");
-       PrintAndLog("  <IV>          : (optional) Initialization vector to use");
+       PrintAndLog("  <IV>          : (optional) Initialization vector to use (ODD and 7bits)");
        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("      hf legic write");
@@ -79,7 +79,7 @@ int usage_legic_rawwrite(void){
        PrintAndLog("  h             : this help");
        PrintAndLog("  <address>     : address to write to");
        PrintAndLog("  <value>       : value to write");
-       PrintAndLog("  <IV>          : (optional) Initialization vector to use");
+       PrintAndLog("  <IV>          : (optional) Initialization vector to use (ODD and 7bits)");
        PrintAndLog("");
        PrintAndLog("Samples:");
        PrintAndLog("      hf legic writeraw");
@@ -90,7 +90,16 @@ int usage_legic_fill(void){
        PrintAndLog("Missing help text.");
        return 0;
 }
-
+int usage_legic_info(void){
+       PrintAndLog("Read info from a legic tag.");
+       PrintAndLog("Usage:  hf legic info [h]");
+       PrintAndLog("Options:");
+       PrintAndLog("  h             : this help");
+       PrintAndLog("");
+       PrintAndLog("Samples:");
+       PrintAndLog("      hf legic info");
+       return 0;
+}
 /*
  *  Output BigBuf and deobfuscate LEGIC RF tag data.
  *  This is based on information given in the talk held
@@ -101,12 +110,11 @@ int CmdLegicDecode(const char *Cmd) {
        int i = 0, k = 0, segmentNum = 0, segment_len = 0, segment_flag = 0;
        int crc = 0, wrp = 0, wrc = 0;
        uint8_t stamp_len = 0;
-       uint8_t data_buf[1052]; // receiver buffer
+       uint8_t data_buf[1024]; // receiver buffer
        char token_type[5] = {0,0,0,0,0};
        int dcf = 0;
        int bIsSegmented = 0;
 
-       // download EML memory, where the "legic read" command puts the data.
        // copy data from proxmark into buffer
        GetFromBigBuf(data_buf,sizeof(data_buf),0);
        if ( !WaitForResponseTimeout(CMD_ACK, NULL, 2000)){
@@ -388,18 +396,51 @@ int CmdLegicRFRead(const char *Cmd) {
        char cmdp = param_getchar(Cmd, 0);
        if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_read();
        
-       uint32_t offset = 0, len = 0, IV = 0;
+       uint32_t offset = 0, len = 0, IV = 1;
        sscanf(Cmd, "%x %x %x", &offset, &len, &IV);
 
        // OUT-OF-BOUNDS check
        if(len + offset > MAX_LENGTH) len = MAX_LENGTH - offset;
        
-       IV &= 0x7F;
+       if ( (IV & 0x7F) != IV ){
+               IV &= 0x7F;
+               PrintAndLog("Truncating IV to 7bits");
+       }
+       if ( (IV & 1) == 0 ){
+               IV |= 0x01;  // IV must be odd
+               PrintAndLog("LSB of IV must be SET");   
+       }
        PrintAndLog("Current IV: 0x%02x", IV);
        
-       UsbCommand c= {CMD_READER_LEGIC_RF, {offset, len, IV}};
+       // get some  prng bytes from 
+       uint8_t temp[32];
+       legic_prng_init(IV);
+       for ( uint8_t j = 0; j < sizeof(temp); ++j) {
+               temp[j] = legic_prng_get_bit(1);
+               legic_prng_forward(1);
+               //PrintAndLog("PRNG: %s", sprint_hex(temp, sizeof(temp)));
+       }
+       PrintAndLog("PRNG: %s", sprint_bin(temp, sizeof(temp)));
+               
+       UsbCommand c = {CMD_READER_LEGIC_RF, {offset, len, IV}};
        clearCommandBuffer();
        SendCommand(&c);
+       UsbCommand resp;
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 2000)) {
+               uint8_t isOK = resp.arg[0] & 0xFF;
+               uint16_t len = resp.arg[1] & 0x3FF;
+                if ( isOK ) {
+                       PrintAndLog("use 'hf legic decode'");
+                }
+                       uint8_t *data = resp.d.asBytes;
+                       PrintAndLog("\nData        |");
+                       PrintAndLog("-----------------------------");
+                       PrintAndLog(" %s|\n", sprint_hex(data, len));
+               // }
+       } else {
+               PrintAndLog("command execution time out");
+               return 1;
+       }
        return 0;
 }
 
@@ -553,7 +594,7 @@ int CmdLegicRfWrite(const char *Cmd) {
        char cmdp = param_getchar(Cmd, 0);
        if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_write();
        
-       uint32_t offset = 0, len = 0, IV = SESSION_IV;
+       uint32_t offset = 0, len = 0, IV = 0;
        
     UsbCommand c = {CMD_WRITER_LEGIC_RF, {0,0,0}};
     int res = sscanf(Cmd, "%x %x %x", &offset, &len, &IV);
@@ -565,8 +606,15 @@ int CmdLegicRfWrite(const char *Cmd) {
        // OUT-OF-BOUNDS check
        if(len + offset > MAX_LENGTH) len = MAX_LENGTH - offset;
 
+       if ( (IV & 0x7F) != IV ){
+               IV &= 0x7F;
+               PrintAndLog("Truncating IV to 7bits");
+       }
+       if ( (IV & 1) == 0 ){
+               IV |= 0x01;  // IV must be odd
+               PrintAndLog("LSB of IV must be SET");   
+       }
        
-       IV &= 0x7F;
        PrintAndLog("Current IV: 0x%02x", IV);
        
        c.arg[0] = offset;
@@ -583,7 +631,7 @@ int CmdLegicRfRawWrite(const char *Cmd) {
        char cmdp = param_getchar(Cmd, 0);
        if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_rawwrite();
        
-       uint32_t address = 0, data = 0, IV = SESSION_IV;        
+       uint32_t address = 0, data = 0, IV = 0; 
        char answer;
 
     UsbCommand c = { CMD_RAW_WRITER_LEGIC_RF, {0,0,0} };
@@ -595,7 +643,14 @@ int CmdLegicRfRawWrite(const char *Cmd) {
        if(address > MAX_LENGTH)
                return usage_legic_rawwrite();
        
-       IV &= 0x7F;
+       if ( (IV & 0x7F) != IV ){
+               IV &= 0x7F;
+               PrintAndLog("Truncating IV to 7bits");
+       }
+       if ( (IV & 1) == 0 ){
+               IV |= 0x01;  // IV must be odd
+               PrintAndLog("LSB of IV must be SET");   
+       }
        PrintAndLog("Current IV: 0x%02x", IV);
 
        c.arg[0] = address;
@@ -644,6 +699,37 @@ int CmdLegicRfFill(const char *Cmd) {
     return 0;
  }
 
+void static calc4(uint8_t *cmd, uint8_t len){
+       crc_t crc;
+       //crc_init_ref(&crc, 4, 0x19 >> 1, 0x5, 0, TRUE, TRUE);
+       crc_init(&crc, 4, 0x19 >> 1, 0x5, 0);
+
+       crc_clear(&crc);
+       crc_update(&crc, 1, 1); /* CMD_READ */
+       crc_update(&crc, cmd[0], 8);
+       crc_update(&crc, cmd[1], 8);
+       printf("crc4 %X\n", reflect(crc_finish(&crc), 4) ) ;
+
+       crc_clear(&crc);
+       crc_update(&crc, 1, 1); /* CMD_READ */
+       crc_update(&crc, cmd[0], 8);
+       crc_update(&crc, cmd[1], 8);
+       printf("crc4 %X\n",  crc_finish(&crc) ) ;
+
+       printf("---- old ---\n");
+       crc_update2(&crc, 1, 1); /* CMD_READ */
+       crc_update2(&crc, cmd[0], 8);
+       crc_update2(&crc, cmd[1], 8);
+       printf("crc4 %X \n", reflect(crc_finish(&crc), 4) ) ;
+
+       
+       crc_clear(&crc);
+       crc_update2(&crc, 1, 1); /* CMD_READ */
+       crc_update2(&crc, cmd[0], 8);
+       crc_update2(&crc, cmd[1], 8);
+       printf("crc4 %X\n",  crc_finish(&crc) ) ;
+}      
 int CmdLegicCalcCrc8(const char *Cmd){
 
        uint8_t *data = NULL;
@@ -719,10 +805,13 @@ int CmdLegicCalcCrc8(const char *Cmd){
        
        switch (type){
                case 16:
-                       PrintAndLog("LEGIC CRC16: %X", CRC16Legic(data, len, uidcrc));
+                       PrintAndLog("Legic crc16: %X", CRC16Legic(data, len, uidcrc));
+                       break;
+               case 4:
+                       calc4(data, 0);
                        break;
                default:
-                       PrintAndLog("LEGIC CRC8: %X",  CRC8Legic(data, len) );
+                       PrintAndLog("Legic crc8: %X",  CRC8Legic(data, len) );
                        break;
        }
        
@@ -730,6 +819,43 @@ int CmdLegicCalcCrc8(const char *Cmd){
        return 0;
 } 
  
+int HFLegicInfo(const char *Cmd, bool verbose) {
+
+       char cmdp = param_getchar(Cmd, 0);
+       if ( cmdp == 'H' || cmdp == 'h' ) return usage_legic_info();
+       
+       UsbCommand c = {CMD_LEGIC_INFO, {0,0,0}};
+       clearCommandBuffer();
+    SendCommand(&c);
+       UsbCommand resp;
+       if (WaitForResponseTimeout(CMD_ACK, &resp, 1000)) {
+               uint8_t isOK = resp.arg[0] & 0xFF;
+               uint16_t tagtype = resp.arg[1] & 0xFFF;
+                if ( isOK ) {
+                       PrintAndLog(" UID : %s", sprint_hex(resp.d.asBytes, 4));
+                       switch(tagtype) {
+                               case 22: PrintAndLog("MIM22 card (22bytes)"); break;
+                               case 256: PrintAndLog("MIM256 card (256bytes)"); break;
+                               case 1024: PrintAndLog("MIM1024 card (1024bytes)");     break;                          
+                               default: {
+                                       PrintAndLog("Unknown card format: %x", tagtype); 
+                                       return 1;
+                               }
+                       }               
+               } else {
+                       PrintAndLog("legic card select failed");
+                       return 1;
+               }
+       } else {
+               PrintAndLog("command execution time out");
+               return 1;
+       }
+       return 0;
+}
+int CmdLegicInfo(const char *Cmd){
+       return HFLegicInfo(Cmd, TRUE);
+}
+       
 static command_t CommandTable[] =  {
        {"help",        CmdHelp,        1, "This help"},
        {"decode",      CmdLegicDecode, 0, "Display deobfuscated and decoded LEGIC RF tag data (use after hf legic reader)"},
@@ -741,6 +867,7 @@ static command_t CommandTable[] =  {
        {"writeraw",CmdLegicRfRawWrite, 0, "<address> <value> <iv> -- Write direct to address"},
        {"fill",        CmdLegicRfFill, 0, "<offset> <length> <value> -- Fill/Write tag with constant value"},
        {"crc8",        CmdLegicCalcCrc8, 1, "Calculate Legic CRC8 over given hexbytes"},
+       {"info",        CmdLegicInfo, 1, "Information"},
        {NULL, NULL, 0, NULL}
 };
 
Impressum, Datenschutz