dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: "hf list legic" annotation now correct prints byte and value for "legic write" command

Browse Source
This commit is contained in:
iceman1001
2016-10-07 20:23:57 +02:00
parent e4d57949df
commit c2ab5e8c4e
2 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
client/cmdhf.c
View File

@@ -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;