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

add iso chaining options

Browse source
This commit is contained in:
merlokk 2021-08-20 20:00:13 +03:00
commit b6118cbde9
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
client/src/cmdhfmfdes.c
View file

@ -4219,7 +4219,7 @@ static int CmdHF14ADesValueOperations(const char *Cmd) {
CLIParserFree(ctx); CLIParserFree(ctx);
// iso chaining works in the lrp mode // iso chaining works in the lrp mode
dctx.isoChaining = (dctx.secureChannel == DACLRP); dctx.isoChaining |= (dctx.secureChannel == DACLRP);
// select // select
res = DesfireSelectAndAuthenticateAppW(&dctx, securechann, selectway, id, noauth, verbose); res = DesfireSelectAndAuthenticateAppW(&dctx, securechann, selectway, id, noauth, verbose);
@ -4493,7 +4493,7 @@ static int DesfileReadFileAndPrint(DesfireContext *dctx, uint8_t fnum, int filet
size_t reclen = 0; size_t reclen = 0;
// iso chaining works in the lrp mode // iso chaining works in the lrp mode
dctx->isoChaining = (dctx->secureChannel == DACLRP); dctx->isoChaining |= (dctx->secureChannel == DACLRP);
// get file settings // get file settings
if (filetype == RFTAuto) { if (filetype == RFTAuto) {
@ -4686,6 +4686,7 @@ static int CmdHF14ADesReadData(const char *Cmd) {
arg_str0("l", "length", "<hex>", "Length to read (3 hex bytes, big endian -> 000000 = Read all data). For records - records count (0 - all). Default 0."), arg_str0("l", "length", "<hex>", "Length to read (3 hex bytes, big endian -> 000000 = Read all data). For records - records count (0 - all). Default 0."),
arg_str0(NULL, "appisoid", "<isoid hex>", "Application ISO ID (ISO DF ID) (2 hex bytes, big endian)."), arg_str0(NULL, "appisoid", "<isoid hex>", "Application ISO ID (ISO DF ID) (2 hex bytes, big endian)."),
arg_str0(NULL, "fileisoid", "<isoid hex>", "File ISO ID (ISO DF ID) (2 hex bytes, big endian). Works only for ISO read commands."), arg_str0(NULL, "fileisoid", "<isoid hex>", "File ISO ID (ISO DF ID) (2 hex bytes, big endian). Works only for ISO read commands."),
arg_lit0(NULL, "isochain", "use iso chaining commands. Switched on by default if secure channel = lrp"),
arg_param_end arg_param_end
}; };
CLIExecWithReturn(ctx, Cmd, argtable, false); CLIExecWithReturn(ctx, Cmd, argtable, false);
@ -4735,6 +4736,8 @@ static int CmdHF14ADesReadData(const char *Cmd) {
return PM3_EINVARG; return PM3_EINVARG;
} }
dctx.isoChaining = arg_get_lit(ctx, 19);
SetAPDULogging(APDULogging); SetAPDULogging(APDULogging);
CLIParserFree(ctx); CLIParserFree(ctx);
@ -5056,7 +5059,7 @@ static int CmdHF14ADesWriteData(const char *Cmd) {
} }
// iso chaining works in the lrp mode // iso chaining works in the lrp mode
dctx.isoChaining = (dctx.secureChannel == DACLRP); dctx.isoChaining |= (dctx.secureChannel == DACLRP);
// write // write
if (op == RFTData) { if (op == RFTData) {