RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-23 07:37:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1471 from merlokk/lrp_value

Browse source 
lrp value operations
This commit is contained in:
Oleg Moiseenko 2021-08-21 15:51:04 +03:00 committed by GitHub
commit 582c9eeb7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
client/src/cmdhfmfdes.c
View file

@ -2102,9 +2102,10 @@ static int CmdHF14ADesSetConfiguration(const char *Cmd) {
PrintAndLogEx(INFO, _CYAN_("%s %06x") " param ID: 0x%02x param[%d]: %s", DesfireSelectWayToStr(selectway), id, paramid, paramlen, sprint_hex(param, paramlen));
}
res = DesfireSelectAndAuthenticateW(&dctx, securechann, selectway, id, false, 0, false, verbose);
res = DesfireSelectAndAuthenticateAppW(&dctx, securechann, selectway, id, false, verbose);
if (res != PM3_SUCCESS) {
DropField();
PrintAndLogEx(FAILED, "Select or authentication %s " _RED_("failed") ". Result [%d] %s", DesfireWayIDStr(selectway, id), res, DesfireAuthErrorToStr(res));
return res;
}
@ -4147,7 +4148,9 @@ static int CmdHF14ADesValueOperations(const char *Cmd) {
"Get File Settings from file from application. Master key needs to be provided or flag --no-auth set (depend on cards settings).",
"hf mfdes value --aid 123456 --fid 01 -> get value app=123456, file=01 with defaults from `default` command\n"
"hf mfdes value --aid 123456 --fid 01 --op credit -d 00000001 -> credit value app=123456, file=01 with defaults from `default` command\n"
"hf mfdes value -n 0 -t des -k 0000000000000000 -f none --aid 123456 --fid 01 -> get value with default factory setup");
"hf mfdes value -n 0 -t des -k 0000000000000000 -f none --aid 123456 --fid 01 -> get value with default factory setup\n"
"hf mfdes val --appisoid df01 --fid 03 -s lrp -t aes -n 1 --op credit --d 00000001 -m encrypt -> credit value in the lrp encrypted mode\n"
"hf mfdes val --appisoid df01 --fid 03 -s lrp -t aes -n 1 --op get -m plain -> get value in plain (nevertheless of mode) works for desfire light (look SetConfiguration option 0x09)");
void *argtable[] = {
arg_param_begin,
@ -4227,6 +4230,8 @@ static int CmdHF14ADesValueOperations(const char *Cmd) {
DropField();
return PM3_ESOFT;
}
if (verbose)
PrintAndLogEx(INFO, "Operation %s " _GREEN_("OK"), CLIGetOptionListStr(DesfireValueFileOperOpts, op));
if (op == MFDES_GET_VALUE) {
PrintAndLogEx(SUCCESS, "Value: " _GREEN_("%d (0x%08x)"), value, value);
@ -4238,6 +4243,8 @@ static int CmdHF14ADesValueOperations(const char *Cmd) {
DropField();
return PM3_ESOFT;
}
if (verbose)
PrintAndLogEx(INFO, "Commit " _GREEN_("OK"));
PrintAndLogEx(SUCCESS, "Value changed " _GREEN_("successfully"));
}
@ -4762,7 +4769,7 @@ static int CmdHF14ADesReadData(const char *Cmd) {
return PM3_EINVARG;
}
res = DesfireSelectAndAuthenticateW(&dctx, securechann, selectway, id, noauth, true, fileisoid, verbose);
res = DesfireSelectAndAuthenticateW(&dctx, securechann, selectway, id, fileisoidpresent, fileisoid, noauth, verbose);
if (res != PM3_SUCCESS) {
DropField();
PrintAndLogEx(FAILED, "Select or authentication %s " _RED_("failed") ". Result [%d] %s", DesfireWayIDStr(selectway, id), res, DesfireAuthErrorToStr(res));
@ -4960,7 +4967,7 @@ static int CmdHF14ADesWriteData(const char *Cmd) {
if (trkeylen > 0)
DesfireGetCardUID(&dctx);
res = DesfireSelectAndAuthenticateW(&dctx, securechann, selectway, id, noauth, true, fileisoid, verbose);
res = DesfireSelectAndAuthenticateW(&dctx, securechann, selectway, id, fileisoidpresent, fileisoid, noauth, verbose);
if (res != PM3_SUCCESS) {
DropField();
PrintAndLogEx(FAILED, "Select or authentication %s " _RED_("failed") ". Result [%d] %s", DesfireWayIDStr(selectway, id), res, DesfireAuthErrorToStr(res));

13
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) {
@ -79,6 +82,7 @@ static const AllowedChannelModesS AllowedChannelModes[] = {
{MFDES_GET_FILE_IDS, DACd40, DCCNative, DCMMACed},
{MFDES_GET_ISOFILE_IDS, DACd40, DCCNative, DCMMACed},
{MFDES_COMMIT_READER_ID, DACd40, DCCNative, DCMMACed},
{MFDES_ABORT_TRANSACTION, DACd40, DCCNative, DCMMACed},
{MFDES_GET_UID, DACd40, DCCNative, DCMEncrypted},
{MFDES_CHANGE_KEY_SETTINGS, DACd40, DCCNative, DCMEncrypted},
@ -114,6 +118,7 @@ static const AllowedChannelModesS AllowedChannelModes[] = {
{MFDES_COMMIT_TRANSACTION, DACEV1, DCCNative, DCMMACed},
{MFDES_CLEAR_RECORD_FILE, DACEV1, DCCNative, DCMMACed},
{MFDES_COMMIT_READER_ID, DACEV1, DCCNative, DCMMACed},
{MFDES_ABORT_TRANSACTION, DACEV1, DCCNative, DCMMACed},
{MFDES_GET_UID, DACEV1, DCCNative, DCMEncrypted},
{MFDES_CHANGE_KEY_SETTINGS, DACEV1, DCCNative, DCMEncrypted},
@ -154,6 +159,8 @@ 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_ABORT_TRANSACTION, DACLRP, DCCNative, DCMMACed},
{MFDES_GET_UID, DACLRP, DCCNative, DCMEncrypted},
{MFDES_CHANGE_FILE_SETTINGS, DACLRP, DCCNative, DCMEncrypted},
@ -183,6 +190,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) {