From 13e521668f436a8a6a32591f26a03d92cfae0930 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Fri, 26 Jan 2018 19:31:13 +0100 Subject: [PATCH] FIX: https://github.com/Proxmark/proxmark3/pull/555 (Thanks @arnie97) --- client/cmdhfmf.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index 58124a9db..3bba7cc1c 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -897,9 +897,9 @@ int CmdHF14AMfNested(const char *Cmd) { if (transferToEml) { uint8_t sectortrailer; if (trgBlockNo < 32*4) { // 4 block sector - sectortrailer = (trgBlockNo & 0x03) + 3; + sectortrailer = (trgBlockNo & ~0x03) + 3; } else { // 16 block sector - sectortrailer = (trgBlockNo & 0x0f) + 15; + sectortrailer = (trgBlockNo & ~0x0f) + 15; } mfEmlGetMem(keyBlock, sectortrailer, 1); @@ -2105,11 +2105,7 @@ int CmdHF14AMfESet(const char *Cmd) { } // 1 - blocks count - UsbCommand cmd = {CMD_MIFARE_EML_MEMSET, {blockNo, 1, 0}}; - memcpy(cmd.d.asBytes, memBlock, 16); - clearCommandBuffer(); - SendCommand(&cmd); - return 0; + return mfEmlSetMem(memBlock, blockNo, 1); } int CmdHF14AMfELoad(const char *Cmd) {