From 4372a728f7287446139d4e96a2325ddd28c6b6c9 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Tue, 9 Jun 2020 21:19:31 +0200 Subject: [PATCH] mad ndef no swap and restore official AID 0xE103 --- client/src/cmdhfmf.c | 4 ++-- client/src/cmdhfmfp.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/client/src/cmdhfmf.c b/client/src/cmdhfmf.c index 1badd75e3..ffc07099b 100644 --- a/client/src/cmdhfmf.c +++ b/client/src/cmdhfmf.c @@ -4614,7 +4614,7 @@ static int CmdHFMFNDEF(const char *Cmd) { CLIParserFree(ctx); - uint16_t ndefAID = 0x03e1; + uint16_t ndefAID = 0xe103; if (aidlen == 2) ndefAID = (aid[0] << 8) + aid[1]; @@ -4650,7 +4650,7 @@ static int CmdHFMFNDEF(const char *Cmd) { uint16_t mad[7 + 8 + 8 + 8 + 8] = {0}; size_t madlen = 0; - res = MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen, true); + res = MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen, false); if (res != PM3_SUCCESS) { PrintAndLogEx(ERR, "can't decode MAD"); return res; diff --git a/client/src/cmdhfmfp.c b/client/src/cmdhfmfp.c index 027fba209..f0d90b495 100644 --- a/client/src/cmdhfmfp.c +++ b/client/src/cmdhfmfp.c @@ -1415,7 +1415,7 @@ static int CmdHFMFPNDEF(const char *Cmd) { CLIParserFree(ctx); - uint16_t ndefAID = 0x03e1; + uint16_t ndefAID = 0xe103; if (aidlen == 2) ndefAID = (aid[0] << 8) + aid[1]; @@ -1451,7 +1451,7 @@ static int CmdHFMFPNDEF(const char *Cmd) { uint16_t mad[7 + 8 + 8 + 8 + 8] = {0}; size_t madlen = 0; - res = MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen, true); + res = MADDecode(sector0, (haveMAD2 ? sector10 : NULL), mad, &madlen, false); if (res != PM3_SUCCESS) { PrintAndLogEx(ERR, "can't decode MAD"); return res;