added some helptexts

This commit is contained in:
iceman1001 2022-02-24 19:31:47 +01:00
commit 3b5a1e8de5
5 changed files with 28 additions and 6 deletions

View file

@ -864,7 +864,7 @@ void SimulateIso14443bTag(uint8_t *pupi) {
} }
} else { } else {
if (g_dbglevel >= DBG_DEBUG) { if (g_dbglevel >= DBG_DEBUG) {
DbpString("CRC passed"); DbpString("CRC ok");
} }
} }
cardSTATE = SIM_IDLE; cardSTATE = SIM_IDLE;
@ -1064,7 +1064,7 @@ void Simulate_iso14443b_srx_tag(uint8_t *uid) {
} }
} else { } else {
if (g_dbglevel >= DBG_DEBUG) { if (g_dbglevel >= DBG_DEBUG) {
DbpString("CRC passed"); DbpString("CRC ok");
} }
} }
cardSTATE = SIM_IDLE; cardSTATE = SIM_IDLE;

View file

@ -362,7 +362,7 @@ static bool TestAPDU(void) {
bool CIPURSETest(bool verbose) { bool CIPURSETest(bool verbose) {
bool res = true; bool res = true;
PrintAndLogEx(INFO, "------ " _CYAN_("CIPURSE Tests") " ------"); PrintAndLogEx(INFO, "------ " _CYAN_("CIPURSE tests") " ------");
res = res && TestKVV(); res = res && TestKVV();
res = res && TestISO9797M2(); res = res && TestISO9797M2();

View file

@ -1803,6 +1803,17 @@ bool CheckCardCipurse(void) {
} }
static int CmdHFCipurseTest(const char *Cmd) { static int CmdHFCipurseTest(const char *Cmd) {
CLIParserContext *ctx;
CLIParserInit(&ctx, "hf cipurse test",
"Regression tests",
"hf cipurse test");
void *argtable[] = {
arg_param_begin,
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
CLIParserFree(ctx);
CIPURSETest(true); CIPURSETest(true);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -1885,7 +1896,7 @@ static command_t CommandTable[] = {
{"updkey", CmdHFCipurseUpdateKey, IfPm3Iso14443a, "Update key"}, {"updkey", CmdHFCipurseUpdateKey, IfPm3Iso14443a, "Update key"},
{"updakey", CmdHFCipurseUpdateKeyAttr, IfPm3Iso14443a, "Update key attributes"}, {"updakey", CmdHFCipurseUpdateKeyAttr, IfPm3Iso14443a, "Update key attributes"},
{"default", CmdHFCipurseDefault, IfPm3Iso14443a, "Set default key and file id for all the other commands"}, {"default", CmdHFCipurseDefault, IfPm3Iso14443a, "Set default key and file id for all the other commands"},
{"test", CmdHFCipurseTest, AlwaysAvailable, "Tests"}, {"test", CmdHFCipurseTest, AlwaysAvailable, "Regression tests"},
{NULL, NULL, 0, NULL} {NULL, NULL, 0, NULL}
}; };

View file

@ -5561,6 +5561,17 @@ static int CmdHF14ADesDump(const char *Cmd) {
} }
static int CmdHF14ADesTest(const char *Cmd) { static int CmdHF14ADesTest(const char *Cmd) {
CLIParserContext *ctx;
CLIParserInit(&ctx, "hf mfdes test",
"Regression crypto tests",
"hf mfdes test");
void *argtable[] = {
arg_param_begin,
arg_param_end
};
CLIExecWithReturn(ctx, Cmd, argtable, true);
CLIParserFree(ctx);
DesfireTest(true); DesfireTest(true);
return PM3_SUCCESS; return PM3_SUCCESS;
} }
@ -5609,7 +5620,7 @@ static command_t CommandTable[] = {
{"value", CmdHF14ADesValueOperations, IfPm3Iso14443a, "Operations with value file (get/credit/limited credit/debit/clear)"}, {"value", CmdHF14ADesValueOperations, IfPm3Iso14443a, "Operations with value file (get/credit/limited credit/debit/clear)"},
{"clearrecfile", CmdHF14ADesClearRecordFile, IfPm3Iso14443a, "Clear record File"}, {"clearrecfile", CmdHF14ADesClearRecordFile, IfPm3Iso14443a, "Clear record File"},
{"-----------", CmdHelp, IfPm3Iso14443a, "----------------------- " _CYAN_("System") " -----------------------"}, {"-----------", CmdHelp, IfPm3Iso14443a, "----------------------- " _CYAN_("System") " -----------------------"},
{"test", CmdHF14ADesTest, AlwaysAvailable, "Test crypto"}, {"test", CmdHF14ADesTest, AlwaysAvailable, "Regression crypto tests"},
{NULL, NULL, NULL, NULL} {NULL, NULL, NULL, NULL}
}; };

View file

@ -208,7 +208,7 @@ static int CmdFDXBdemodBI(const char *Cmd) {
PrintAndLogEx(SUCCESS, "Reserved/RFU: %u", reservedCode); PrintAndLogEx(SUCCESS, "Reserved/RFU: %u", reservedCode);
PrintAndLogEx(SUCCESS, "Animal Tag: %s", animalBit ? _YELLOW_("True") : "False"); PrintAndLogEx(SUCCESS, "Animal Tag: %s", animalBit ? _YELLOW_("True") : "False");
PrintAndLogEx(SUCCESS, "Has extended data: %s [0x%X]", dataBlockBit ? _YELLOW_("True") : "False", extended); PrintAndLogEx(SUCCESS, "Has extended data: %s [0x%X]", dataBlockBit ? _YELLOW_("True") : "False", extended);
PrintAndLogEx(SUCCESS, "CRC: 0x%04X - [%04X] - %s", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("Passed") : _RED_("Fail") ); PrintAndLogEx(SUCCESS, "CRC: 0x%04X - [%04X] - %s", crc_16, calcCrc, (calcCrc == crc_16) ? _GREEN_("ok") : _RED_("fail") );
if (g_debugMode) { if (g_debugMode) {
PrintAndLogEx(DEBUG, "Start marker %d; Size %d", preambleIndex, size); PrintAndLogEx(DEBUG, "Start marker %d; Size %d", preambleIndex, size);