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

CHG: uniform output.

Browse source
This commit is contained in:
iceman1001 2018-12-18 18:43:27 +01:00
commit 4ef59c3771
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
client/emv/emvcore.c
View file

@ -249,7 +249,7 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
memcpy(&data[5], apdu.data, apdu.Lc); memcpy(&data[5], apdu.data, apdu.Lc);
if (APDULogging) if (APDULogging)
PrintAndLogEx(NORMAL, ">>>> %s", sprint_hex(data, (IncludeLe?6:5) + apdu.Lc)); PrintAndLogEx(SUCCESS, ">>>> %s", sprint_hex(data, (IncludeLe?6:5) + apdu.Lc));
switch(channel) { switch(channel) {
case ECC_CONTACTLESS: case ECC_CONTACTLESS:
@ -269,7 +269,7 @@ int EMVExchangeEx(EMVCommandChannel channel, bool ActivateField, bool LeaveField
} }
if (APDULogging) if (APDULogging)
PrintAndLogEx(NORMAL, "<<<< %s", sprint_hex(Result, *ResultLen)); PrintAndLogEx(SUCCESS, "<<<< %s", sprint_hex(Result, *ResultLen));
if (*ResultLen < 2) { if (*ResultLen < 2) {
return 200; return 200;
@ -422,7 +422,7 @@ int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON,
} }
retrycnt = 0; retrycnt = 0;
PrintAndLogEx(FAILED, "Retry failed [%s]. Skiped...", AIDlist[i].aid); PrintAndLogEx(FAILED, "Retry failed [%s]. Skipped...", AIDlist[i].aid);
} }
continue; continue;
} }
@ -431,8 +431,11 @@ int EMVSearch(EMVCommandChannel channel, bool ActivateField, bool LeaveFieldON,
if (res) if (res)
continue; continue;
if (decodeTLV){ if (!datalen)
PrintAndLogEx(NORMAL, "%s:", AIDlist[i].aid); continue;
if (decodeTLV) {
PrintAndLogEx(SUCCESS, "%s", AIDlist[i].aid);
TLVPrintFromBuffer(data, datalen); TLVPrintFromBuffer(data, datalen);
} }
} }