view format

This commit is contained in:
merlokk 2023-11-06 00:35:48 +02:00
commit 4c828f4424

View file

@ -7474,35 +7474,35 @@ static int CmdHF14AGen4Info(const char *cmd) {
PrintAndLogEx(INFO, "---------- Gen4 configuration ----------");
if (resplen != 30 && resplen != 32) {
PrintAndLogEx(INFO, "Raw config [%02d]: %s", resplen, sprint_hex_inrow(resp, resplen));
PrintAndLogEx(INFO, "Raw config [%02d] %s", resplen, sprint_hex_inrow(resp, resplen));
PrintAndLogEx(WARNING, "Unknown config format");
return PM3_SUCCESS;
}
if (verbose)
PrintAndLogEx(INFO, "Raw config [%02d]: %s", resplen, sprint_hex_inrow(resp, resplen));
PrintAndLogEx(INFO, "Raw config [%02d]. %s", resplen, sprint_hex_inrow(resp, resplen));
PrintAndLogEx(INFO, "UL protocol: %02x", resp[0]);
PrintAndLogEx(INFO, "UID length: %02x", resp[1]);
PrintAndLogEx(INFO, "Password: %s", sprint_hex_inrow(&resp[2], 4));
PrintAndLogEx(INFO, "GTU mode: %02x", resp[6]);
PrintAndLogEx(INFO, "ATS [%d]: %s", resp[7], sprint_hex_inrow(&resp[8], resp[7]));
PrintAndLogEx(INFO, "ATQA: %02x%02x", resp[25]);
PrintAndLogEx(INFO, "SAK: %02x", resp[26]);
PrintAndLogEx(INFO, "UL protocol..... %02x", resp[0]);
PrintAndLogEx(INFO, "UID length...... %02x", resp[1]);
PrintAndLogEx(INFO, "Password........ %s", sprint_hex_inrow(&resp[2], 4));
PrintAndLogEx(INFO, "GTU mode........ %02x", resp[6]);
PrintAndLogEx(INFO, "ATS [%02d]........ %s", resp[7], sprint_hex_inrow(&resp[8], resp[7]));
PrintAndLogEx(INFO, "ATQA............ %02x%02x", resp[25]);
PrintAndLogEx(INFO, "SAK............. %02x", resp[26]);
res = mfG4GetFactoryTest(pwd, resp, &resplen, false);
if (res == PM3_SUCCESS && resplen > 2) {
if (verbose)
PrintAndLogEx(INFO, "Raw test [%02d]: %s", resplen, sprint_hex_inrow(resp, resplen));
PrintAndLogEx(INFO, "Raw test [%02d]... %s", resplen, sprint_hex_inrow(resp, resplen));
if (resp[resplen - 2] == 0x66 && resp[resplen - 1] == 0x66)
PrintAndLogEx(INFO, "Card type : generic");
PrintAndLogEx(INFO, "Card type....... generic");
else if (resp[resplen - 2] == 0x02 && resp[resplen - 1] == 0xaa)
PrintAndLogEx(INFO, "Card type : limited functionality");
PrintAndLogEx(INFO, "Card type....... limited functionality");
else if (resp[resplen - 2] == 0x06 && resp[resplen - 1] == 0xa0)
PrintAndLogEx(INFO, "Card type : broken functionality");
PrintAndLogEx(INFO, "Card type....... broken functionality");
else
PrintAndLogEx(INFO, "Card type : unknown %02x%02x", resp[resplen - 2], resp[resplen - 1]);
PrintAndLogEx(INFO, "Card type....... unknown %02x%02x", resp[resplen - 2], resp[resplen - 1]);
}
return PM3_SUCCESS;