X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/5660920679bb5c5ae48a0e189b52886b0d0776f5..8b2a5d400a4b49fa5a62d5eb5af62fb4ff78f502:/client/cmdhf.c diff --git a/client/cmdhf.c b/client/cmdhf.c index 47203808..031f065e 100644 --- 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,7 +389,7 @@ void annotateLegic(char *exp, size_t size, uint8_t* cmd, uint8_t cmdsize){ } case 9: case 11: { - uint8_t cmdBit = (cmd[1] & 1); + uint16_t address = (cmd[2] << 7) | cmd[1] >> 1; if (cmdBit == LEGIC_READ) @@ -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; @@ -857,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");