CHG: Minor tweaks, the tracing dissappeared, the spindelay for powering up too...

[proxmark3-svn] / client / cmdhflegic.c

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 2cfb286ea90acac200de0eab914ccafaa8cca59c..031265fa89812d0ee3fcfc26b7d44840f8a21336 100644 (file)
--- a/client/cmdhflegic.c
+++ b/client/cmdhflegic.c
@@ -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
@@ -404,13 +413,15 @@ int CmdLegicRFRead(const char *Cmd) {
        PrintAndLog("Current IV: 0x%02x", IV);
        
        // get some  prng bytes from 
-       uint8_t temp[12];
+       uint8_t temp[32];
        legic_prng_init(IV);
-       for ( uint8_t j = 0; j < sizeof(temp); ++j)
-               temp[j] = legic_prng_get_bits(8);
-
-       PrintAndLog("PRNG: %s", sprint_hex(temp, sizeof(temp)));
-       
+       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);
@@ -703,7 +714,7 @@ void static calc4(uint8_t *cmd, uint8_t len){
        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), 4 ) ;
+       printf("crc4 %X\n",  crc_finish(&crc) ) ;
 
        printf("---- old ---\n");
        crc_update2(&crc, 1, 1); /* CMD_READ */
@@ -716,7 +727,7 @@ void static calc4(uint8_t *cmd, uint8_t len){
        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), 4 ) ;
+       printf("crc4 %X\n",  crc_finish(&crc) ) ;
 }      
  
 int CmdLegicCalcCrc8(const char *Cmd){
@@ -808,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 {
+                       if ( verbose ) PrintAndLog("legic card select failed");
+                       return 1;
+               }
+       } else {
+               if ( verbose ) 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)"},
@@ -819,7 +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",        CmdLegicCalcCrc8, 1, "Information"},
+       {"info",        CmdLegicInfo, 1, "Information"},
        {NULL, NULL, 0, NULL}
 };