CHG: @ikarus23 removed all missleadning warnings for GCC6.1.1.

[proxmark3-svn] / client / cmdhflegic.c

diff --git a/client/cmdhflegic.c b/client/cmdhflegic.c
index 31d5900548c6bf01a2682c97cb2a664aabecdeaf..2200a15b9b69af8fabe12a469801d0f3584d23c0 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);
@@ -418,11 +429,14 @@ int CmdLegicRFRead(const char *Cmd) {
        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' or");
-                       PrintAndLog("'data hexsamples %d' to view results", len);       
-                       
-               }
+                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;
@@ -685,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;
@@ -760,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;
        }
        
@@ -771,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)"},
@@ -782,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}
 };