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

small fix and block scan command

Browse source
This commit is contained in:
merlokk 2018-12-06 19:47:57 +02:00
commit 17d0194aea
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
client/emv/cmdemv.c
View file

@ -707,16 +707,16 @@ int CmdEMVExec(const char *cmd) {
bool forceSearch = arg_get_lit(5); bool forceSearch = arg_get_lit(5);
enum TransactionType TrType = TT_MSD; enum TransactionType TrType = TT_MSD;
if (arg_get_lit(6))
TrType = TT_QVSDCMCHIP;
if (arg_get_lit(7)) if (arg_get_lit(7))
TrType = TT_CDA; TrType = TT_QVSDCMCHIP;
if (arg_get_lit(8)) if (arg_get_lit(8))
TrType = TT_CDA;
if (arg_get_lit(9))
TrType = TT_VSDC; TrType = TT_VSDC;
bool GenACGPO = arg_get_lit(9); bool GenACGPO = arg_get_lit(10);
EMVCommandChannel channel = ECC_CONTACTLESS; EMVCommandChannel channel = ECC_CONTACTLESS;
if (arg_get_lit(10)) if (arg_get_lit(11))
channel = ECC_CONTACT; channel = ECC_CONTACT;
CLIParserFree(); CLIParserFree();
@ -1167,6 +1167,12 @@ int CmdEMVScan(const char *cmd) {
SetAPDULogging(showAPDU); SetAPDULogging(showAPDU);
// TODO
if (channel == ECC_CONTACT) {
PrintAndLogEx(ERR, "Do not use contact interface. Exit.");
return 1;
}
// current path + file name // current path + file name
if (!strstr(crelfname, ".json")) if (!strstr(crelfname, ".json"))
strcat(crelfname, ".json"); strcat(crelfname, ".json");