From 36545f0a5617d71b06e6d5773802fcf33ed5525a Mon Sep 17 00:00:00 2001 From: Arnie97 Date: Sat, 27 Jan 2018 01:09:56 +0800 Subject: [PATCH 1/2] hf mf eset: reuse mfEmlSetMem(). --- client/cmdhfmf.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index d0320148..ddfb1c02 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -1685,10 +1685,7 @@ int CmdHF14AMfESet(const char *Cmd) } // 1 - blocks count - UsbCommand c = {CMD_MIFARE_EML_MEMSET, {blockNo, 1, 0}}; - memcpy(c.d.asBytes, memBlock, 16); - SendCommand(&c); - return 0; + return mfEmlSetMem(memBlock, blockNo, 1); } From 7b7416bd3b7e0b9a3003ec33da943bd26b505d82 Mon Sep 17 00:00:00 2001 From: Arnie97 Date: Sat, 27 Jan 2018 01:55:38 +0800 Subject: [PATCH 2/2] hf mf nested: transfer keys to the correct block in one sector mode. --- client/cmdhfmf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/cmdhfmf.c b/client/cmdhfmf.c index ddfb1c02..dbb6d092 100644 --- a/client/cmdhfmf.c +++ b/client/cmdhfmf.c @@ -683,9 +683,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);