From: Arnie97 <arnie97@gmail.com>
Date: Fri, 26 Jan 2018 17:55:38 +0000 (+0800)
Subject: hf mf nested: transfer keys to the correct block in one sector mode.
X-Git-Tag: v3.1.0~79^2
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/refs/pull/555/head?hp=36545f0a5617d71b06e6d5773802fcf33ed5525a

hf mf nested: transfer keys to the correct block in one sector mode.
---

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);