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

mfc ndef needs swapped mad according to our default way to treat mad...

Browse source
This commit is contained in:
Philippe Teuwen 2020-06-09 21:07:53 +02:00
commit 92f4c445e4
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/src/cmdhfmf.c
View file

@ -4528,8 +4528,8 @@ static int CmdHF14AMfMAD(const char *Cmd) {
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "--- " _CYAN_("MAD Information") " ---------------------------"); PrintAndLogEx(INFO, "--- " _CYAN_("MAD Information") " -------------------------------");
PrintAndLogEx(INFO, "-------------------------------------------------------------"); PrintAndLogEx(INFO, "---------------------------------------------------");
if (verbose) { if (verbose) {
PrintAndLogEx(SUCCESS, "Raw:"); PrintAndLogEx(SUCCESS, "Raw:");
@ -4650,7 +4650,7 @@ static int CmdHFMFNDEF(const char *Cmd) {
uint16_t mad[7 + 8 + 8 + 8 + 8] = {0}; uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
size_t madlen = 0; size_t madlen = 0;
res = MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen, false); res = MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen, true);
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
PrintAndLogEx(ERR, "can't decode MAD"); PrintAndLogEx(ERR, "can't decode MAD");
return res; return res;

6
client/src/cmdhfmfp.c
View file

@ -1328,8 +1328,8 @@ static int CmdHFMFPMAD(const char *Cmd) {
} }
PrintAndLogEx(NORMAL, ""); PrintAndLogEx(NORMAL, "");
PrintAndLogEx(INFO, "--- " _CYAN_("MAD Information") " ---------------------------"); PrintAndLogEx(INFO, "--- " _CYAN_("MAD Information") " -------------------------------");
PrintAndLogEx(INFO, "-------------------------------------------------------------"); PrintAndLogEx(INFO, "---------------------------------------------------");
if (verbose) { if (verbose) {
PrintAndLogEx(SUCCESS, "Raw:"); PrintAndLogEx(SUCCESS, "Raw:");
@ -1451,7 +1451,7 @@ static int CmdHFMFPNDEF(const char *Cmd) {
uint16_t mad[7 + 8 + 8 + 8 + 8] = {0}; uint16_t mad[7 + 8 + 8 + 8 + 8] = {0};
size_t madlen = 0; size_t madlen = 0;
res = MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen, false); res = MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen, true);
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
PrintAndLogEx(ERR, "can't decode MAD"); PrintAndLogEx(ERR, "can't decode MAD");
return res; return res;