RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2024-09-21 15:56:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix value operations in the encoded state

Browse source
This commit is contained in:
merlokk 2021-08-21 14:52:45 +03:00
parent 7bd355dbb5
commit 3d82da8ebe
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/src/cmdhfmfdes.c
View file

@ -4227,6 +4227,8 @@ static int CmdHF14ADesValueOperations(const char *Cmd) {
DropField();
return PM3_ESOFT;
}
if (verbose)
PrintAndLogEx(INFO, "Operation %s OK", CLIGetOptionListStr(DesfireValueFileOperOpts, op));
if (op == MFDES_GET_VALUE) {
PrintAndLogEx(SUCCESS, "Value: " _GREEN_("%d (0x%08x)"), value, value);
@ -4238,6 +4240,8 @@ static int CmdHF14ADesValueOperations(const char *Cmd) {
DropField();
return PM3_ESOFT;
}
if (verbose)
PrintAndLogEx(INFO, "Commit OK");
PrintAndLogEx(SUCCESS, "Value changed " _GREEN_("successfully"));
}

10
client/src/mifare/desfiresecurechan.c
View file

@ -28,13 +28,16 @@ static const uint8_t CommandsCanUseAnyChannel[] = {
MFDES_READ_DATA2,
MFDES_WRITE_DATA,
MFDES_WRITE_DATA2,
MFDES_GET_VALUE,
MFDES_READ_RECORDS,
MFDES_READ_RECORDS2,
MFDES_WRITE_RECORD,
MFDES_WRITE_RECORD2,
MFDES_UPDATE_RECORD,
MFDES_UPDATE_RECORD2,
MFDES_GET_VALUE,
MFDES_CREDIT,
MFDES_DEBIT,
MFDES_LIMITED_CREDIT,
};
static bool CommandCanUseAnyChannel(uint8_t cmd) {
@ -154,6 +157,7 @@ static const AllowedChannelModesS AllowedChannelModes[] = {
{MFDES_GET_FILE_SETTINGS, DACLRP, DCCNative, DCMMACed},
{MFDES_GET_KEY_VERSION, DACLRP, DCCNative, DCMMACed},
{MFDES_CLEAR_RECORD_FILE, DACLRP, DCCNative, DCMMACed},
{MFDES_COMMIT_TRANSACTION, DACLRP, DCCNative, DCMMACed},
{MFDES_GET_UID, DACLRP, DCCNative, DCMEncrypted},
{MFDES_CHANGE_FILE_SETTINGS, DACLRP, DCCNative, DCMEncrypted},
@ -183,6 +187,10 @@ static const CmdHeaderLengthsS CmdHeaderLengths[] = {
{MFDES_WRITE_RECORD2, 7},
{MFDES_UPDATE_RECORD, 10},
{MFDES_UPDATE_RECORD2, 10},
{MFDES_GET_VALUE, 1},
{MFDES_CREDIT, 1},
{MFDES_DEBIT, 1},
{MFDES_LIMITED_CREDIT, 1},
};
static uint8_t DesfireGetCmdHeaderLen(uint8_t cmd) {