github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 21:03:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

textual

Browse source
This commit is contained in:
iceman1001 2021-06-24 18:23:10 +02:00
commit eed0ca4796
3 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

39
client/src/cipurse/cipursetest.c
View file

@ -32,9 +32,9 @@ static bool TestKVV(void) {
bool res = memcmp(KeyKvv, kvv, CIPURSE_KVV_LENGTH) == 0; bool res = memcmp(KeyKvv, kvv, CIPURSE_KVV_LENGTH) == 0;
if (res) if (res)
PrintAndLogEx(INFO, "kvv: " _GREEN_("passed")); PrintAndLogEx(INFO, "kvv.............. " _GREEN_("passed"));
else else
PrintAndLogEx(ERR, "kvv: " _RED_("fail")); PrintAndLogEx(ERR, "kvv.............. " _RED_("fail"));
return res; return res;
} }
@ -50,9 +50,9 @@ static bool TestISO9797M2(void) {
res = res && (FindISO9797M2PaddingDataLen(data, ddatalen) == 4); res = res && (FindISO9797M2PaddingDataLen(data, ddatalen) == 4);
if (res) if (res)
PrintAndLogEx(INFO, "ISO9797M2: " _GREEN_("passed")); PrintAndLogEx(INFO, "ISO9797M2........ " _GREEN_("passed"));
else else
PrintAndLogEx(ERR, "ISO9797M2: " _RED_("fail")); PrintAndLogEx(ERR, "ISO9797M2........ " _RED_("fail"));
return res; return res;
} }
@ -84,9 +84,9 @@ static bool TestSMI(void) {
res = res && (CipurseCGetSMI(&ctx, true) == 0x89); res = res && (CipurseCGetSMI(&ctx, true) == 0x89);
if (res) if (res)
PrintAndLogEx(INFO, "SMI: " _GREEN_("passed")); PrintAndLogEx(INFO, "SMI.............. " _GREEN_("passed"));
else else
PrintAndLogEx(ERR, "SMI: " _RED_("fail")); PrintAndLogEx(ERR, "SMI.............. " _RED_("fail"));
return res; return res;
} }
@ -107,9 +107,9 @@ static bool TestMIC(void) {
res = res && (CipurseCCheckMIC(TestData, 6, mic)); res = res && (CipurseCCheckMIC(TestData, 6, mic));
if (res) if (res)
PrintAndLogEx(INFO, "MIC: " _GREEN_("passed")); PrintAndLogEx(INFO, "MIC.............. " _GREEN_("passed"));
else else
PrintAndLogEx(ERR, "MIC: " _RED_("fail")); PrintAndLogEx(ERR, "MIC.............. " _RED_("fail"));
return res; return res;
} }
@ -150,9 +150,9 @@ static bool TestAuth(void) {
res = res && (memcmp(ctx.frameKey, framekey, sizeof(framekey)) == 0); res = res && (memcmp(ctx.frameKey, framekey, sizeof(framekey)) == 0);
if (res) if (res)
PrintAndLogEx(INFO, "Auth: " _GREEN_("passed")); PrintAndLogEx(INFO, "Auth............. " _GREEN_("passed"));
else else
PrintAndLogEx(ERR, "Auth: " _RED_("fail")); PrintAndLogEx(ERR, "Auth............. " _RED_("fail"));
return res; return res;
} }
@ -202,9 +202,9 @@ static bool TestMAC(void) {
res = res && (memcmp(ctx.frameKey, framekey4, sizeof(framekey4)) == 0); res = res && (memcmp(ctx.frameKey, framekey4, sizeof(framekey4)) == 0);
if (res) if (res)
PrintAndLogEx(INFO, "channel MAC: " _GREEN_("passed")); PrintAndLogEx(INFO, "channel MAC...... " _GREEN_("passed"));
else else
PrintAndLogEx(ERR, "channel MAC: " _RED_("fail")); PrintAndLogEx(ERR, "channel MAC...... " _RED_("fail"));
return res; return res;
} }
@ -248,9 +248,9 @@ static bool TestEncDec(void) {
res = res && (memcmp(dstdata, TestData, 16) == 0); res = res && (memcmp(dstdata, TestData, 16) == 0);
if (res) if (res)
PrintAndLogEx(INFO, "channel EncDec: " _GREEN_("passed")); PrintAndLogEx(INFO, "channel EncDec... " _GREEN_("passed"));
else else
PrintAndLogEx(ERR, "channel EncDec: " _RED_("fail")); PrintAndLogEx(ERR, "channel EncDec... " _RED_("fail"));
return res; return res;
} }
@ -340,9 +340,9 @@ static bool TestAPDU(void) {
res = res && (sw == 0xccdd); res = res && (sw == 0xccdd);
if (res) if (res)
PrintAndLogEx(INFO, "apdu: " _GREEN_("passed")); PrintAndLogEx(INFO, "apdu............. " _GREEN_("passed"));
else else
PrintAndLogEx(ERR, "apdu: " _RED_("fail")); PrintAndLogEx(ERR, "apdu............. " _RED_("fail"));
return res; return res;
} }
@ -350,7 +350,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();
@ -363,9 +363,10 @@ bool CIPURSETest(bool verbose) {
PrintAndLogEx(INFO, "---------------------------"); PrintAndLogEx(INFO, "---------------------------");
if (res) if (res)
PrintAndLogEx(SUCCESS, " Test(s) [ %s ]", _GREEN_("ok")); PrintAndLogEx(SUCCESS, " Tests [ %s ]", _GREEN_("ok"));
else else
PrintAndLogEx(FAILED, " Test(s) [ %s ]", _RED_("fail")); PrintAndLogEx(FAILED, " Tests [ %s ]", _RED_("fail"));
PrintAndLogEx(NORMAL, "");
return res; return res;
} }

1
client/src/cmdhfcipurse.c
View file

@ -689,7 +689,6 @@ static int CmdHFCipurseDeleteFile(const char *Cmd) {
return PM3_SUCCESS; return PM3_SUCCESS;
} }
bool CheckCardCipurse(void) { bool CheckCardCipurse(void) {
uint8_t buf[APDU_RES_LEN] = {0}; uint8_t buf[APDU_RES_LEN] = {0};
size_t len = 0; size_t len = 0;

2
tools/pm3_tests.sh
View file

@ -491,7 +491,7 @@ while true; do
if ! $SLOWTESTS; then if ! $SLOWTESTS; then
if ! CheckExecute "hf iclass loclass test" "$CLIENTBIN -c 'hf iclass loclass --test'" "key diversification (ok)"; then break; fi if ! CheckExecute "hf iclass loclass test" "$CLIENTBIN -c 'hf iclass loclass --test'" "key diversification (ok)"; then break; fi
if ! CheckExecute "emv test" "$CLIENTBIN -c 'emv test'" "Test(s) \[ ok"; then break; fi if ! CheckExecute "emv test" "$CLIENTBIN -c 'emv test'" "Test(s) \[ ok"; then break; fi
if ! CheckExecute "hf cipurse test" "$CLIENTBIN -c 'hf cipurse test'" "Test(s) \[ ok"; then break; fi if ! CheckExecute "hf cipurse test" "$CLIENTBIN -c 'hf cipurse test'" "Tests \[ ok"; then break; fi
fi fi
fi fi
echo -e "\n------------------------------------------------------------" echo -e "\n------------------------------------------------------------"