github/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2026-05-09 03:00:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

move commit phase outside

Browse Source
This commit is contained in:
merlokk
2021-07-28 18:24:50 +03:00
parent f5d5f088b8
commit 896aeefd9a
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
client/src/cmdhfmfdes.c
View File

@@ -6643,21 +6643,16 @@ static int CmdHF14ADesWriteData(const char *Cmd) {
return PM3_ESOFT;
}
if (commit) {
res = DesfireCommitTransaction(&dctx, false, 0);
if (res != PM3_SUCCESS) {
PrintAndLogEx(ERR, "Desfire CommitTransaction command " _RED_("error") ". Result: %d", res);
DropField();
return PM3_ESOFT;
}
}
PrintAndLogEx(SUCCESS, "Write data file %02x " _GREEN_("success"), fnum);
if (verbose)
PrintAndLogEx(INFO, "Write data file %02x " _GREEN_("success"), fnum);
}
if (op == RFTValue) {
if (datalen != 4)
PrintAndLogEx(WARNING, "Value " _RED_("should be") " 4 byte length instead of %d", datalen);
if (datalen != 4) {
PrintAndLogEx(ERR, "Value " _RED_("should be") " 4 byte length instead of %d", datalen);
DropField();
return PM3_EINVARG;
}
uint32_t value = MemBeToUint4byte(data);
uint8_t vop = (debit) ? MFDES_DEBIT : MFDES_CREDIT;
@@ -6668,16 +6663,8 @@ static int CmdHF14ADesWriteData(const char *Cmd) {
return PM3_ESOFT;
}
if (commit) {
res = DesfireCommitTransaction(&dctx, false, 0);
if (res != PM3_SUCCESS) {
PrintAndLogEx(ERR, "Desfire CommitTransaction command " _RED_("error") ". Result: %d", res);
DropField();
return PM3_ESOFT;
}
}
PrintAndLogEx(SUCCESS, "Value file %02x (%s) " _GREEN_("success"), fnum, CLIGetOptionListStr(DesfireValueFileOperOpts, vop));
if (verbose)
PrintAndLogEx(INFO, "%s value file %02x (%s) " _GREEN_("success"), (debit) ? "Debit" : "Credit", fnum, CLIGetOptionListStr(DesfireValueFileOperOpts, vop));
}
if (op == RFTRecord) {
@@ -6722,8 +6709,25 @@ static int CmdHF14ADesWriteData(const char *Cmd) {
if (op == RFTMAC) {
PrintAndLogEx(ERR, "Can't " _RED_("write") " to transaction MAC file");
DropField();
return PM3_EINVARG;
}
// commit phase
if (commit) {
res = DesfireCommitTransaction(&dctx, false, 0);
if (res != PM3_SUCCESS) {
PrintAndLogEx(ERR, "Desfire CommitTransaction command " _RED_("error") ". Result: %d", res);
DropField();
return PM3_ESOFT;
}
if (verbose)
PrintAndLogEx(INFO, "Commit " _GREEN_("OK"));
}
PrintAndLogEx(INFO, "Write %s file %02x " _GREEN_("success"), CLIGetOptionListStr(DesfireReadFileTypeOpts, op), fnum);
DropField();
return PM3_SUCCESS;