diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index adc1dd739..be770be15 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -7479,30 +7479,33 @@ static int CmdHF14AGen4Info(const char *cmd) { 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 [%02d]........ %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[24], resp[25]); + PrintAndLogEx(INFO, "SAK................. %02x", resp[26]); + PrintAndLogEx(INFO, "UL mode............. %02x", resp[27]); + PrintAndLogEx(INFO, "max rd/wr sectors... %02x", resp[28]); + PrintAndLogEx(INFO, "block0 direct wr.... %02x", resp[29]); 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;