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

cov 353970 and rename

Browse source
This commit is contained in:
merlokk 2021-07-26 19:15:54 +03:00
commit 062cf98166
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/src/cmdhfmfdes.c
View file

@ -6392,7 +6392,7 @@ static int CmdHF14ADesValueOperations(const char *Cmd) {
if (op == MFDES_GET_VALUE) { if (op == MFDES_GET_VALUE) {
PrintAndLogEx(SUCCESS, "Value: " _GREEN_("%d (0x%08x)"), value, value); PrintAndLogEx(SUCCESS, "Value: " _GREEN_("%d (0x%08x)"), value, value);
} else { } else {
DesfireCommitTrqansaction(&dctx, false, 0); res = DesfireCommitTransaction(&dctx, false, 0);
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
PrintAndLogEx(ERR, "Desfire CommitTrqansaction command " _RED_("error") ". Result: %d", res); PrintAndLogEx(ERR, "Desfire CommitTrqansaction command " _RED_("error") ". Result: %d", res);
DropField(); DropField();
@ -6448,7 +6448,7 @@ static int CmdHF14ADesValueOperations(const char *Cmd) {
if (verbose) if (verbose)
PrintAndLogEx(INFO, "Value debited"); PrintAndLogEx(INFO, "Value debited");
DesfireCommitTrqansaction(&dctx, false, 0); res = DesfireCommitTransaction(&dctx, false, 0);
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
PrintAndLogEx(ERR, "Desfire CommitTrqansaction command " _RED_("error") ". Result: %d", res); PrintAndLogEx(ERR, "Desfire CommitTrqansaction command " _RED_("error") ". Result: %d", res);
DropField(); DropField();

4
client/src/mifare/desfirecore.c
View file

@ -1072,14 +1072,14 @@ int DesfireDeleteFile(DesfireContext *dctx, uint8_t fnum) {
return DesfireCommandTxData(dctx, MFDES_DELETE_FILE, &fnum, 1); return DesfireCommandTxData(dctx, MFDES_DELETE_FILE, &fnum, 1);
} }
int DesfireCommitTrqansaction(DesfireContext *dctx, bool enable_options, uint8_t options) { int DesfireCommitTransaction(DesfireContext *dctx, bool enable_options, uint8_t options) {
if (enable_options) if (enable_options)
return DesfireCommandTxData(dctx, MFDES_COMMIT_TRANSACTION, &options, 1); return DesfireCommandTxData(dctx, MFDES_COMMIT_TRANSACTION, &options, 1);
else else
return DesfireCommandNoData(dctx, MFDES_COMMIT_TRANSACTION); return DesfireCommandNoData(dctx, MFDES_COMMIT_TRANSACTION);
} }
int DesfireAbortTrqansaction(DesfireContext *dctx) { int DesfireAbortTransaction(DesfireContext *dctx) {
return DesfireCommandNoData(dctx, MFDES_ABORT_TRANSACTION); return DesfireCommandNoData(dctx, MFDES_ABORT_TRANSACTION);
} }

4
client/src/mifare/desfirecore.h
View file

@ -89,8 +89,8 @@ void DesfirePrintCreateFileSettings(uint8_t filetype, uint8_t *data, size_t len)
int DesfireCreateFile(DesfireContext *dctx, uint8_t ftype, uint8_t *fdata, size_t fdatalen, bool checklen); int DesfireCreateFile(DesfireContext *dctx, uint8_t ftype, uint8_t *fdata, size_t fdatalen, bool checklen);
int DesfireDeleteFile(DesfireContext *dctx, uint8_t fid); int DesfireDeleteFile(DesfireContext *dctx, uint8_t fid);
int DesfireCommitTrqansaction(DesfireContext *dctx, bool enable_options, uint8_t options); int DesfireCommitTransaction(DesfireContext *dctx, bool enable_options, uint8_t options);
int DesfireAbortTrqansaction(DesfireContext *dctx); int DesfireAbortTransaction(DesfireContext *dctx);
int DesfireValueFileOperations(DesfireContext *dctx, uint8_t fid, uint8_t operation, uint32_t *value); int DesfireValueFileOperations(DesfireContext *dctx, uint8_t fid, uint8_t operation, uint32_t *value);